Fixed access token constructor
Merge branch 'develop' into feature/base-client