2025-06-05 - releng
04:45	<Krinkle>	gitpuppet@deployment-puppetserver-1:/srv/git/operations/puppet$ Cherry-pick https://gerrit.wikimedia.org/r/c/operations/puppet/+/1153764, ref T289318	[releng]