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