Merge branch 'next/fixes-non-critical' into next/soc