Merge branch 'lisa-master' into tests

3 jobs for tests in 2 minutes and 29 seconds