Merge branch 'Wunkolo-standalone-cpuid' into dev