Merge branch 'develop' into 'fix_email_env'

# Conflicts:
#   app/controllers/api/v1/accounts/passwords_controller.rb
#   db/schema.rb
2 jobs for fix_email_env in 5 minutes and 59 seconds (queued for 51 minutes and 34 seconds)