Fix "treestate_id"
Merge remote-tracking branch 'upstream/pr/11506' into pr/11506

* upstream/pr/11506:
  Fix "treestate_id"