It looks like it might happen, but it's too big a fix to hotfix, going to take a major patch and testing.