Merge branch 'testing-leak-detective'