Merged with latest oaeproject/Hilary