CLOUDIFY-2022 fix cr comments