Merge "Fix Authentication flow for secondary provider" into main