r2312 - forward-porting to trunk