Made changes to Auto Transport to remove Web Sockets if not supported

#1884
Merge branch 'release' into dev