Merge branch 'feature/nodeinfo-polls' into 'develop'