Merged to main in https://github.com/puppetlabs/puppet/commit/999d2278f86237e01f8036f356a91ae7855dc063
Passed CI in de6de62149