Merge "Fix default provider logic" into main