Merge change 9294

* changes:
  Massive reworking of EAS serialization; much smaller and faster now