Merge branch 'MLAB-638' into 'testing'

MLAB-643: fixing UI issues

See merge request !141
1 job for testing in 19 seconds (queued for 2 seconds)