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

Revert "Merge branch...

See merge request !133
Status Name Job ID Coverage
  Test
passed django-tests #42683
ubuntu regular

00:04:09