Revert "Revert "fixes CC-221""
Merge pull request #1134 from control-center/revert-1133-revert-1132-feature/CC-221

Re-do feature/CC-221