I can move it to a pull request to master. Then this pull request must wait until that one is merged as Avro serialization in this pull request needs to use it.