Resolve "Options with space dont get encapsulated from hosts database"

Merge request reports