Merge pull request from FOSS-Cloud/master

Merge pull request from FOSS-Cloud/1.2