Merged r5540 and r5542 from trunk: