Merge "fix(auth): don't overwrite pk with converted pk when rotpk is hash" into integration