Pushing to production after reviewing on staging

Includes PRs #834 and #836.