Keero 322

https://mirantis.jira.com/browse/KEERO-322