Merge changes I7442bdd9,I99a0f0c0 into 3.0

* changes:
  revert
  gerrit