Sorry for the noise. Your intentions were perfectly worded out in the bug report, just not reflected in git. Uploaded now. More RC bugs to fix before the freeze.