[MERGE] avro branch