Merging r2337 from trunk
Merging r2339 from trunk