This has no corresponding merge-request because the branch was made as a direct fixup specific to 3.9.