Merge "Turn on new socket schema"