Fix issue when creating an invalid ITokenProvider
Merge branch 'dev'