Patch Set 2: I would prefer that you didn't submit this; IP review completed

(1 inline comment)

- rebased to make it compile against 1.0.0-SNAPSHOT
- could you provide a change or change series (I suspect you already have it) which can start this page ?