DO-2300 Issue has been fixed.
Merge pull request #1400 from shivalinga/dev-branch

DO-2300 Issue has been fixed.