Update to trunk r205646