Refactoring for merge

10 jobs for !9 with onestep in 58 minutes and 32 seconds (queued for 960 minutes and 26 seconds)
merge request