Merge branch 'mark/update_testing' into meeting/LI59e

4 jobs for meeting/LI59e