Merge in Upstream changes

Merge in all upstream changes from orphu/development