Added server_wait flag for ConnectPath. Added StreamOptimization support.