Merge branch 'evolution_bdm' into 'ticket_1642'

# Conflicts:
#   members_space/static/css/members-space.css
2 jobs from ticket_1642 in 1 minute 26 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #2079
lint:js

00:21

passed #2080
unit:django

01:04