split lock.h to lock.cpp
Fix crash on unknown node
Merge remote-tracking branch 'upstream/master' into next