Merge branch 'rs/use-free-and-null'