Merge branch 'cherry-pick-0c4feb14' into 'master'

Merge branch '2676-musst_reset_cmd' into master

See merge request !3741
10 jobs for master in 102 minutes and 18 seconds (queued for 3 seconds)