Merge pull request #2942 from benthecarman/node-id-slice