Merge branch 'acmacm-master-patch-44264' into 'master'