Merge remote branch 'gerrit/master' into refactor