Merge branch 'fix/nodeinfo-nil-features' into 'develop'