added new files after merge
Merge pull request #2133 from ssushma/dev-branch

added new files after merge
Merges for release 6.6.a1
Merge pull request #2135 from ssushma/dev-branch

Merges from release 6.6.a1
"Added the removed code while merging"