Pushing to production after reviewing on staging

Includes PR #699 and commit c4233e9f14e60d47a683f840ff1255564a620e34.