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