Merge branch 'cpu_depend'