Merged OAE master into Avocet master