Merge branch 'remove/fedsockets' into 'develop'