Added support for cpu type.
Merge branch 'test' into dev