Merge branches 'cross-platform/debug_ll' and 'cross-platform/cpu-mapping' into next/cross-platform