Merge branch 'for-6.17-fixes' into test-merge-6.17-rc6