PAAS-129 issue fixes

Changes related to the public JIRA - PAAS-129 changes. Please review and merge