Merge branch 'for-next/selftests' into for-next/core