Working on tree and custom-app
Merge remote-tracking branch 'origin/dev' into dev
KindTree trait ready