Merging r2343 from trunk