merging Sprint 36 changes in the 'release' branch back into master
Merge pull request #6802 from adobe/bchin/merging-release-sprint-36-into-master

merging Sprint 36 changes in the 'release' branch back into master