2025-05-22 - releng
21:09	<bd808>	Cherry-picked https://gerrit.wikimedia.org/r/c/operations/puppet/+/1143602 (T393404)	[releng]