moved logic from Avro module to Core
Merge branch 'master' into develop

* master:
  moved logic from Avro module to Core