Move EDI to InfoStore am: a1218bcf19
am: 2675fccb3a

* commit '2675fccb3a4c6ba93f1ed35a50ca5a08e44d1be1':
  Move EDI to InfoStore