Merge "Enhance rescope token test using v3"