Merge branch 'feature/nodeinfo' into 'develop'