File diff r12647:3ada08b745f5 → r12648:24c912bd53f6