sprint 40
Merge pull request #7778 from adobe/set-sprint-40

sprint 40