Merge pull request #2501 from suryanarayanakb/release-6.6.3.a1

Changes made for displaying the cursor icon and messages
Merge remote-tracking branch 'upstream/release-6.6.3.a1' into release-6.6.3.a1