This one we finally have tracked down and fixed and will be in the 7.5 release. I'd give the changes needed here, but they are pretty complex and span multiple files, so we need to do it with an actual release.