Merge branch 'feature/nodeinfo-frontend-config' into 'develop'