>> Should I send a rebased patch for inclusion > Yes, please. Here it is, Stefan