Merge pull request #20059 from hgl/acme