This patch is untested, but I believe it to be a mostly complete implementation of the fix.
The unittests obviously need to be updated to match this.
This patch is untested, but I believe it to be a mostly complete implementation of the fix.
The unittests obviously need to be updated to match this.