Merge branch 'develop' into 'password_reset_email_change'

# Conflicts:
#   docker-compose.yml
2 jobs for password_reset_email_change in 3 minutes (queued for 36 minutes and 4 seconds)