Merge "Null check; back behavior" into jb-dev