Merge branch 'add-nodeinfo-doc' into 'develop'