Upcoming code freeze for 1.25