Merging r261441, r261447, and r261546: