Merge remote-tracking branch 'origin/master'
PLA-1305 clean up, unicode for some models