Fix ZEN-12865 to unblock QA
Merge pull request #739 from control-center/feature/ZEN12865

Fix ZEN-12865 to unblock QA