Updates in upstream since fork

Merging upstream