Pushing to production after reviewing on staging

Includes PRs #702 and #709.