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