Merge branch 'jk/apache-lsan'