Merge "Refactor AddUserAuthArgs for extensibility" into pi-dev