add bits and pieces for gerrit code review