when working with a completely unrelated security backport for REL1_31, REL1_32 and REL1_33. I manually merged these since the patch for master tested fine (and the patch was one line of unrelated code for an entirely separate extension.)

It looks like this issue may have appeared within other contexts before? See: T201615, T209216.