I think 4-1-stable does this allready and master of corutse? How about rebase?