DO-5313 and DO-5065 issues has been fixed.
Merge pull request #1311 from shivalinga/dev-branch

DO-5313 and DO-5065 issues has been fixed.