Patch Set 4: Looks good to me, approved; Unclean IP, do not check in

- thanks Robin, works great now
- handling commit message header in separate change is ok
- rebased to current master
- filed bug and CQ for IP review (change exceeds 250 lines)