Hotfix - Fixed long requests issue.
Merge branch 'hotfix' into develop