Merge "Add MultiConfig for fallback logic"