It does not look like the change was applied properly to the 5.0 branch. HHH-10170 will apply it there.