Merge branch 'revert-f6b697ee' into 'master'

Revert "Merge branch 'MLAB-367' into 'master'"

See merge request !65
1 job for master in 4 seconds (queued for 2 seconds)