Squashed 'server/' changes from e160384..3dd33d5

3dd33d5 Push subtree as a part of circle ci

git-subtree-dir: server
git-subtree-split: 3dd33d54527c8b983d1e1eb7beaf419dd63371e2
Test squash message