improved handling of Authentication token
Merge commit '1a1744c929ab4d0a3f54b5fdf4f8eec97ff821e9'