HomeClusterLabs Projects

Merge pull request #2425 from clumens/misc-fixes