Pull changes for #1571 (add host tracking to fallbacks)