AVRO-3795: Fix backport to 1.11.3
3 files changed