Merge branch 'for-next/late-arrivals' into for-next/core