Merge pull request #277 from eric-wu/develop

Rename NodeLineage... To NodeTree...
Merge pull request #278 from eric-wu/develop

Merge release-1.17 patch back to develop