Merge branch 'revert-6aa8b46f' into 'master'

Revert "Merge branch 'MLAB-436t' into 'master'"

See merge request !92
1 job for master in 6 seconds (queued for 3 seconds)