Remerge of the corral (see holiday commit #7)