Merge change 5983

* changes:
  Begin adding mesh