Commits to fix BPMS-954 issue

This commits are cherry picked from 6.3.x branch to master branch in order to resolve resolve BPMS-954 issue.