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

DO-5245 issue has been fixed.