HomeClusterLabs Projects

Merge pull request #3632 from kgaillot/backport

Description

Merge pull request #3632 from kgaillot/backport

Backport recent changes to 2.1 branch

Merged Changes