Pushing to production after reviewing on staging

Includes PRs #717 and #718.