merge up to r1765609 from trunk