Patch Set 3:

Dariusz, I'm a bit confused: which change set should be rebased on top of which? :) Seems my revision is now parent of yours. Or you want them to be completely separate - based on master?