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