Merge "Add "host_name_separator" variable to Context class"