Merge branch 'for-6.19-fixes' into for-next