We won't be backporting the fix to OSP 7. The change is too invasive, in fact we're still dealing with regressions in this upstream.