Avocet master merge

Merged with latest oaeproject/Hilary master