Merged to main in https://github.com/puppetlabs/puppet/commit/c6923c49e6d3882920be03619735b8441b21ef38
Passed CI in 99a52d4737