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