Merge branch 'ab/unconditional-free-and-null'