Merge branch 'develop'
Don't add socket JS to options as it goes over the network