Cherry pick host.rb from master