replaced code with gerrit version