Merge change Ie093215f into eclair

* changes:
  Add truncation at 100k (EAS 2.5) and 200k (EAS 12) (#2184807)