2.4 doesn't have that issue, 2.6 does though, which I expect to contain a fix for this some time this summer.
But, to "really support" newer version this would need the PR, yes... Even though some deployments would still be ok w/ pre-5 versions.