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