Merge branch 'development' into 'master'

Sync Development and Master

See merge request adega/adega!67
1 job for master in 1 minute and 58 seconds (queued for 2 seconds)
latest
Status Name Job ID Coverage
  Test
passed django-tests #35391
ubuntu regular

00:01:58