Accepting into master, but created separated task to address this: https://mirantis.jira.com/browse/PRD-1081