Merge OAE 9.0 into avocet 0.9