Merge tag 'numascale' into x86/platform