Pushing to production after reviewing on staging

Includes:
* PRs: #653 and #655, and
* Direct commit to dev: 7c6583731bbf0388976e3b2bdb6b0557bb2e991b