Merge branch 'cb/notes-freeing-always-null-fix'