Merge branch 'dt/cpu-type-rework' into dt/next