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

Code clean-up. * rs/use-free-and-null: repository: use FREE_AND_NULL