Merged to main in https://github.com/puppetlabs/puppet/commit/6c1cb951e1e2e3a6682c9fc6630bf5379e629411
Passed CI in c403763bbb