Merge branch 'hotfix-cs/partial-revert' into 'dev'

Hotfix - Partial revert !713

See merge request !717
6 jobs for dev in 10 minutes and 15 seconds (queued for 3 seconds)
Status Name Job ID Coverage
  Test Tools
passed test_tools #675684

00:00:18

 
  Test Quality
passed code_quality #675685
web

00:00:11

 
  Test Unit
passed test_browser_unit #675686
web

00:00:23

passed test_server_unit #675687
web

00:00:20

 
  Test Functional
passed ff32-server-functional #675688
x86_64 docker

00:05:59

passed ff45-server-functional #675689
x86_64 docker

00:05:48