Updates
Merged with latest from upstream