Pushing to production after reviewing on staging

Includes #617, #636, #637, #638 (== #639).