code comments added for DO-6067 and CORE-2198 stories.
Merge pull request #2365 from shivalinga/release-6.6.3.a1

code comments added for DO-6067 and CORE-2198 stories.