Merge branch 'MT1105' into public_master