Pushing to production after reviewing on staging

Includes PRs #620, #630, #647, #664 and #671.