Merge branch 'master' into develop
update default socket timeout from 30 to 60 seconds
Merge branch 'develop'