Merge branch 'jn/lstree'