changes for avro-1.5.3-AGM