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