Will do it within https://mirantis.jira.com/browse/PRD-915 task as a separate pull request.