Merge "fix(pauth): make pauth_helpers linking generic" into integration