r5283: Merge -r5279 and-r5280 from trunk.