Merge branch 'master' into lang_update_1011_1539509694