Merge branch 'fixes-v5.12' into next-testing