Merge branch 'MLAB-524' into 'testing'

manage session

See merge request !39
1 job for testing in 8 seconds (queued for 1 second)