latest fix from avro merged