Merges for release 6.6.a1
Merge pull request #2135 from ssushma/dev-branch

Merges from release 6.6.a1