File diff r17604:b855df9b91b2 → r17605:f07eebee5502