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