merge r7243-7255 from trunk