Improve the performance of isRoot() to constant time
Merge branch 'release-y' into develop
Merge remote-tracking branch 'upstream/develop' into develop