Merge "Fix uses-after-free" into main