Merging r2333, r2334, r2335 from trunk