Merge branch 'MDL-25939'