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