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