Merge "Pass username on v3 token issue"