Pushing to production after reviewing on staging

Includes PRs #618 and #622.