Merge pull request #4214 from Baystation12/dev

Dev freeze staging [DO NOT MERGE]
Merge remote-tracking branch 'upstream/master' into dev-freeze
Merge remote-tracking branch 'upstream/dev-freeze' into dev