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