Merge pull request #24227 from liewegas/wip-36104-hammer