Update values
Merge branch 'feature/ZEN-13221' into feature/ZEN-13221-2
Merge pull request #798 from control-center/feature/ZEN-13221-2

Feature/zen 13221 2