Merge change 7792

* changes:
  Code generator cleanup