Use host from the main project if it's available
Merge branch 'remote_compat' into gh