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