Merge branch 'MDL-64568-master'