[3.8] Add TokensServiceProvider

@nlegoff, can you have a quick look at this so I can merge it today ?