Merge branch '2859-wrong-controller-velocity-is-different-from-set-velocity-warning' into 'master'

Resolve "wrong "controller velocity is different from set velocity" warning"

Closes #2859

See merge request !3868
10 jobs for master in 100 minutes and 38 seconds (queued for 7 seconds)