Merge remote-tracking branch 'upstream/master' into properties

Merge master into properties