Merge in changes for ConvexOS 11.0.