Upstream modifications
Made sampling of no-host optional