Merge branch 'for-prod' into for-prod-heroku