Merge "Fix ReliableSurface to be more reliable"