Fixing reference to server scope
Merge branch 'develop'