Keero 280

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