Merge branch 'master' into wip_leon_T7755_more_fix_to_admin_translate