rebased develop and resolved the merge conflicts
Merge pull request #1003 from control-center/CC-94

fixes CC-94