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

DO-5934 issue has been fixed.