Merge 'master' back into dev

I noticed dev is getting behind master mainly because it doesn't have a bunch of fixes which happened in preview/staging.