Merge branches 'bf/doc' and 'db/tartree'