Merge branch 'tr/log-tree-optim'