Pushing to production after reviewing on staging

Includes PRs #611 and #629.