Merge branch 'MDL-25907_wip'