fix: tree builder
Merge branch 'feature/alpha-version' into feature/2.2.0