Pushing to production after reviewing on staging

Includes PRs #885 and #886.