Merge "Add ability to override public host"