Merge branch 'MDL-25637'