merge r1359:1364 from trunk