Merge branch 'rs/free-and-null'