DO-4805 issue has been fixed.
Merge pull request #645 from shivalinga/dev-branch

DO-4805 issue has been fixed.