Merge branch 'fix/add-oauth-token-indexes' into 'develop'