rebased patches