Merged with latest Hilary master

Merged with latest oaeproject/Hilary:master