fixes CC-597
Merge branch 'release/1.0.0' into feature/CC-597.a
fixes CC-597
Merge pull request #1427 from control-center/feature/CC-597.a

Fixes CC-597