merge up to r1765852 from trunk