Merge change 21090

* changes:
  remove Gears