merged jwt token in the server module. issue #2229