merge r2109 from trunk