Aviary: Simplify 4.0 spec
Merge pull request #10417 from Threadflip/aviary-cleanup

Aviary: Simplify 4.0 spec