DO-6061 issue has been fixed.
Merge pull request #2356 from shivalinga/release-6.6.3.a1

DO-6061 issue has been fixed.