Merge tag 'v3.12' into x86/cpu, to refresh the branch before queueing up more changes