Merge branch 'asan_fixes' into 'main'