Refactoring TS 103 120

4 jobs for !82 with cr/103120/046
in 29 seconds, using 0 compute credits, and was queued for 3 seconds
merge request