Squashed 'server/' changes from 16519d7..4b36e64

4b36e64 Changed mock

git-subtree-dir: server
git-subtree-split: 4b36e64e4085465ac5601137ed8e7f0c9b630dee
Merge commit '19f3d5dce6c52a6e503b1bd6ecca253d5b3637ed'