Merge "Adding checking of host_status"