File diff r25797:35cb6173b9dc → r25798:6346d16799a1