And make it possible to find a node by uuid (cherry picked from commit 1c59068e) (cherry picked from commit 98331f0021f27c52c3e70052343696a3547c4f5b)