Merge "Fix logic for token searching on authorize_create" into sc-v2-dev