DO-4793 bug has been fixed.
Merge pull request #637 from shivalinga/dev-branch

DO-4793 bug has been fixed.