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