Fixes CC-521
Merge pull request #1342 from control-center/feature/CC-521

Fixes CC-521