Co-authored-by: Nick Pope <nick@nickpope.me.uk> Backport of 4114531cb763f7cf226d3904d3693af4dc634947 from main