[Client] Changed request timeout to 10 seconds
Merge branch 'develop' into feature/user-mention
[Client] Minor bug fix