Merge branch 'rollingRework' into 'develop'

Rolling rework

See merge request !150
4 jobs for develop in 9 minutes and 20 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #37610
test:python37

00:05:45

passed #37611
test:python38

00:04:51

 
  Deploy
passed #37612
pages

00:03:35

passed pages:deploy

00:00:00