Merged r5573, r5574, r5577, r5578, and r5579 from trunk.