Merge branch 'MDL-52383'