Adding AVRO-975 preview