Merge pull request #117822 from SheepYhangCN/allow_fallback