Merge "Protect dereferencing null in Node" into devel/master