Merge branch 'MDL-25981'