Merge "More plumbing for fallback configs"