Merge changes I4e92d70c,Ibf25ff58 into main

* changes:
  Avoid outer/inner class name clashes
  Emit extension fields