Applied to all three branches, extracted from the larger PR.

this was really just intended for master, no need to backport really.