@astrofrog - does this address your rebase/marge concern?