Refactor for better handling of local host.
Split 'common/' into commit '201f722ace421706381605f8cfcf235a1e082bbe'

git-subtree-dir: common
git-subtree-mainline: 1dd5fb18ead01046afec2cb5f001d21430d607d6
git-subtree-split: 201f722ace421706381605f8cfcf235a1e082bbe