Merge branch 'jk/test-asan'