Merged with latest Hilary master

Merged with latest Hilary master