merge changes from gerrit review 1624