CM upstreaming WIP & old stuff