File diff r6951:4f69e3e27c06 → r6952:db104ead2672