Merged to main in https://github.com/puppetlabs/puppet/commit/a0387c1744e191c384e5accecde44c1f33bd0a4f
Passed CI in e6ba8f9345