File diff r25596:7bf7822e5659 → r25597:d42d008d01d5