Merge the rest of the FullyBooted patch