Merge branch 'cherry-pick-86b866d1' into 'master'

Merge branch 'track-fit-workshop-jadevrie' into 'master'

See merge request !115
3 jobs for master in 26 seconds (queued for 18 seconds)