Merge pull request #3318 from rest-switch/avro