Merge pull request #19599 from totten/master-jwt