[445697] Avoid changed global scope provider factory API
5 files changed