Token management updated
Merge branch 'Fixture/new_way_of_managing_token' into develop