Merge of production issues into the mainline staging branch

Once everything is confirmed to work in staging, we can merge this, and that should happen before !30 (merged)