Merge pull request #6727 from nupplaphil/issue/6472-nodeinfo