Fix tree regression issue
Add custom row support
Merge branch 'master' into 1.2