Migration to 'getByToken', part II.
Merge pull request #1126 from vadler/70X-consumesMigration-II

Consumes migration -- PAT Migration to 'getByToken', part II.