Merge pull request #1951 from wpaulino/remove-get-node-secret