misc: merge official trees