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)
Status Job ID Name Coverage
  Test
passed #28521
ruby postgres
test

00:02:58

 
  Build
passed #28522
docker build
build

00:00:02