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

DO-3297 issue has been fixed.