Merge branch 'develop' into 'fix_email_env'

# Conflicts:
#   docker-compose.yml
2 jobs for fix_email_env in 3 minutes and 38 seconds (queued for 1 second)