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

Toggle buttons added
Merge remote-tracking branch 'upstream/release-6.6.3.a1' into release-6.6.3.a1