Pushing to production after reviewing on staging

Includes PRs #891 and #892.