Unless CA has already been working on this, I doubt we will see a fix before the release.