Merge branch 'nodeinfo-federation-enabled' into 'develop'