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