Merge

**Merge** in _changes_ from `upstream`
Spoke to Francesco and decided to merge from upstream and then create a new branch for his changes