Merge branch 'db/host-alias'