Indeed but I had no plans to do this in time for 5.1, it's too short notice and too bigger risk. Something for 5.2 IMO.

What we can do is apply the suggested change in the pull req to fix the issue at hand, and leave further changes that we all seem to agree on for 5.2.