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