merge up to r1765634 from trunk