Update staging to reflect what is currently in production

All these commits were sent direct to production without being put into staging. We should ensure that Staging remains an exact copy of production (plus the current changes we are making).