Merge pull request #2274 from anilgooru/release-6.6.3.a1

Merge changed.
Updated comments for methods and classes.
Merge remote-tracking branch 'upstream/release-6.6.3.a1' into release-6.6.3.a1

* upstream/release-6.6.3.a1: