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

DO-4669 issue has been fixed.