Merge "Adding ability to set DEFAULT/host"