Merge branch 'cpu-features'