TASK: CS fixes

10 jobs for feature/45-removed-signals in 2 minutes and 10 seconds (queued for 2 seconds)