Squashed 'server/' changes from 8978e3f..bff774d

bff774d Added host to responses

git-subtree-dir: server
git-subtree-split: bff774de708c35c16f845ea2ade7b87c4a76bd49
Merge commit '6a373155bc26cef5b52f098a5e220651fe42b836'