Merge "Use 'parent' property instead of 'children' to build SF tree." into main