Merge branch 'MDL-42957-26' into MDL-42957-master