Merge branch 'add-admin-to-node-info' into 'develop'