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