Merge branch 'master_MDL-28410'