Merge branch 'revert-730112f3' into 'development'

Revert "Merge branch...

See merge request !133
1 job for development in 4 minutes and 32 seconds (queued for 3 seconds)
Status Name Job ID Coverage
  Test
passed django-tests #42679
regular ubuntu

00:04:32