Merge branch 'fix/fedsocket-useragent' into 'develop'