Merged r5591 from trunk: