Merge branch 'jk/build-with-asan'