Pushing to production after reviewing on staging

PRs #591, #610 and #613.