9.2.0 upgrade

Merged OAE master into Avocet master