Merge "Fix concurrent start bytes race"