(CE-380) Tweaks to ja and zh messages
Merge branch 'CE-380' into dev