Merge branch 'valls-patch-7' into 'master'

Set unit to CT2CounterTimer

Closes #1081

See merge request !3672
11 jobs for master in 147 minutes and 33 seconds (queued for 3 seconds)