misc: merge official CM tree changes