Merge branch 'penfield-new-nodes' into penfield