PR optimization/15242