Merge 'upstream-master' into release

Preliminary cut for release
Merge 'upstream-master' into release

Picks up #2480 as well.
Merging release back to master