Hi Doug, Per our discussion, I've written up a patch for PR7161 and attached it to the bug. Please review when you have time. Thanks! -- Zhanyong