Merge branch 'mark/update_testing' into meeting/LI59e

4 jobs for meeting/LI59e
in 0 seconds, using 0 compute credits, and was queued for 0 seconds