Merge Upstream updates
Merge branch 'master' into upstream

Merging local changes to upstream content