Dev

Merge remote-tracking branch 'upstream/dev-freeze' into dev.
Trying to keep those map conflicts at bay.