Merge branch 'rj/test-with-leak-check'