Merge branch 'release/Chai'
Merge branch 'master' into integration

# Via Raja.S
* master: