Merge tag 'v5.3-rc7' into x86/platform, to refresh the branch