I filed and patched the most obvious bug but testing this is something I can't do for a while due to other work and the time it takes. Grabbing tomorrow's snapshot of 5.2.0 would be a useful thing to do if you care about this feature. -- Scott