WebRTC-Experiment/issues/270 specific updates