Merge "Remove unused primaryAuth/strongAuth parameter" into main