PRD-1320 && PRD-1327 fixes

UPDATED!
just https://mirantis.jira.com/browse/PRD-1320 fix