Avocet master merge

Merged with latest oaeproject/3akai-ux master