I added this to 5.0.0+ because I do not yet have a 5.0 bug fix release set up. But I fully expect this to wait for post-5.0 Final due to priority