Merge "Remove Surface connect flag and add Ring Buffer." into main