Merge "Fix use after free issue found with ASAN build"