Merge branch 'revert-jul13' into 'testing'

Revert "Merge branch 'MLAB-677' into 'testing'"

See merge request !168
1 job for testing in 16 seconds (queued for 3 seconds)