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