Merge branch 'for-6.15-fixes' into tmp