Merged r5509 from trunk: