merge r4529 to trunk