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