Merge branch 'bugfix/6468-disable-webrtc' into testing