Please review branch feature/clienttokenreuse