fr and jp release 40 update
Merge pull request #145 from adobe/fr_jp_update_release40

fr and jp release 40 update