diff --git a/3rdparty/jwt/BeforeValidException.php b/3rdparty/jwt/BeforeValidException.php
index a6ee2f7c..c147852b 100644
--- a/3rdparty/jwt/BeforeValidException.php
+++ b/3rdparty/jwt/BeforeValidException.php
@@ -1,7 +1,7 @@
 <?php
+
 namespace Firebase\JWT;
 
 class BeforeValidException extends \UnexpectedValueException
 {
-
 }
diff --git a/3rdparty/jwt/CachedKeySet.php b/3rdparty/jwt/CachedKeySet.php
new file mode 100644
index 00000000..baf801f1
--- /dev/null
+++ b/3rdparty/jwt/CachedKeySet.php
@@ -0,0 +1,258 @@
+<?php
+
+namespace Firebase\JWT;
+
+use ArrayAccess;
+use InvalidArgumentException;
+use LogicException;
+use OutOfBoundsException;
+use Psr\Cache\CacheItemInterface;
+use Psr\Cache\CacheItemPoolInterface;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
+use RuntimeException;
+use UnexpectedValueException;
+
+/**
+ * @implements ArrayAccess<string, Key>
+ */
+class CachedKeySet implements ArrayAccess
+{
+    /**
+     * @var string
+     */
+    private $jwksUri;
+    /**
+     * @var ClientInterface
+     */
+    private $httpClient;
+    /**
+     * @var RequestFactoryInterface
+     */
+    private $httpFactory;
+    /**
+     * @var CacheItemPoolInterface
+     */
+    private $cache;
+    /**
+     * @var ?int
+     */
+    private $expiresAfter;
+    /**
+     * @var ?CacheItemInterface
+     */
+    private $cacheItem;
+    /**
+     * @var array<string, array<mixed>>
+     */
+    private $keySet;
+    /**
+     * @var string
+     */
+    private $cacheKey;
+    /**
+     * @var string
+     */
+    private $cacheKeyPrefix = 'jwks';
+    /**
+     * @var int
+     */
+    private $maxKeyLength = 64;
+    /**
+     * @var bool
+     */
+    private $rateLimit;
+    /**
+     * @var string
+     */
+    private $rateLimitCacheKey;
+    /**
+     * @var int
+     */
+    private $maxCallsPerMinute = 10;
+    /**
+     * @var string|null
+     */
+    private $defaultAlg;
+
+    public function __construct(
+        string $jwksUri,
+        ClientInterface $httpClient,
+        RequestFactoryInterface $httpFactory,
+        CacheItemPoolInterface $cache,
+        int $expiresAfter = null,
+        bool $rateLimit = false,
+        string $defaultAlg = null
+    ) {
+        $this->jwksUri = $jwksUri;
+        $this->httpClient = $httpClient;
+        $this->httpFactory = $httpFactory;
+        $this->cache = $cache;
+        $this->expiresAfter = $expiresAfter;
+        $this->rateLimit = $rateLimit;
+        $this->defaultAlg = $defaultAlg;
+        $this->setCacheKeys();
+    }
+
+    /**
+     * @param string $keyId
+     * @return Key
+     */
+    public function offsetGet($keyId): Key
+    {
+        if (!$this->keyIdExists($keyId)) {
+            throw new OutOfBoundsException('Key ID not found');
+        }
+        return JWK::parseKey($this->keySet[$keyId], $this->defaultAlg);
+    }
+
+    /**
+     * @param string $keyId
+     * @return bool
+     */
+    public function offsetExists($keyId): bool
+    {
+        return $this->keyIdExists($keyId);
+    }
+
+    /**
+     * @param string $offset
+     * @param Key $value
+     */
+    public function offsetSet($offset, $value): void
+    {
+        throw new LogicException('Method not implemented');
+    }
+
+    /**
+     * @param string $offset
+     */
+    public function offsetUnset($offset): void
+    {
+        throw new LogicException('Method not implemented');
+    }
+
+    /**
+     * @return array<mixed>
+     */
+    private function formatJwksForCache(string $jwks): array
+    {
+        $jwks = json_decode($jwks, true);
+
+        if (!isset($jwks['keys'])) {
+            throw new UnexpectedValueException('"keys" member must exist in the JWK Set');
+        }
+
+        if (empty($jwks['keys'])) {
+            throw new InvalidArgumentException('JWK Set did not contain any keys');
+        }
+
+        $keys = [];
+        foreach ($jwks['keys'] as $k => $v) {
+            $kid = isset($v['kid']) ? $v['kid'] : $k;
+            $keys[(string) $kid] = $v;
+        }
+
+        return $keys;
+    }
+
+    private function keyIdExists(string $keyId): bool
+    {
+        if (null === $this->keySet) {
+            $item = $this->getCacheItem();
+            // Try to load keys from cache
+            if ($item->isHit()) {
+                // item found! retrieve it
+                $this->keySet = $item->get();
+                // If the cached item is a string, the JWKS response was cached (previous behavior).
+                // Parse this into expected format array<kid, jwk> instead.
+                if (\is_string($this->keySet)) {
+                    $this->keySet = $this->formatJwksForCache($this->keySet);
+                }
+            }
+        }
+
+        if (!isset($this->keySet[$keyId])) {
+            if ($this->rateLimitExceeded()) {
+                return false;
+            }
+            $request = $this->httpFactory->createRequest('GET', $this->jwksUri);
+            $jwksResponse = $this->httpClient->sendRequest($request);
+            $this->keySet = $this->formatJwksForCache((string) $jwksResponse->getBody());
+
+            if (!isset($this->keySet[$keyId])) {
+                return false;
+            }
+
+            $item = $this->getCacheItem();
+            $item->set($this->keySet);
+            if ($this->expiresAfter) {
+                $item->expiresAfter($this->expiresAfter);
+            }
+            $this->cache->save($item);
+        }
+
+        return true;
+    }
+
+    private function rateLimitExceeded(): bool
+    {
+        if (!$this->rateLimit) {
+            return false;
+        }
+
+        $cacheItem = $this->cache->getItem($this->rateLimitCacheKey);
+        if (!$cacheItem->isHit()) {
+            $cacheItem->expiresAfter(1); // # of calls are cached each minute
+        }
+
+        $callsPerMinute = (int) $cacheItem->get();
+        if (++$callsPerMinute > $this->maxCallsPerMinute) {
+            return true;
+        }
+        $cacheItem->set($callsPerMinute);
+        $this->cache->save($cacheItem);
+        return false;
+    }
+
+    private function getCacheItem(): CacheItemInterface
+    {
+        if (\is_null($this->cacheItem)) {
+            $this->cacheItem = $this->cache->getItem($this->cacheKey);
+        }
+
+        return $this->cacheItem;
+    }
+
+    private function setCacheKeys(): void
+    {
+        if (empty($this->jwksUri)) {
+            throw new RuntimeException('JWKS URI is empty');
+        }
+
+        // ensure we do not have illegal characters
+        $key = preg_replace('|[^a-zA-Z0-9_\.!]|', '', $this->jwksUri);
+
+        // add prefix
+        $key = $this->cacheKeyPrefix . $key;
+
+        // Hash keys if they exceed $maxKeyLength of 64
+        if (\strlen($key) > $this->maxKeyLength) {
+            $key = substr(hash('sha256', $key), 0, $this->maxKeyLength);
+        }
+
+        $this->cacheKey = $key;
+
+        if ($this->rateLimit) {
+            // add prefix
+            $rateLimitKey = $this->cacheKeyPrefix . 'ratelimit' . $key;
+
+            // Hash keys if they exceed $maxKeyLength of 64
+            if (\strlen($rateLimitKey) > $this->maxKeyLength) {
+                $rateLimitKey = substr(hash('sha256', $rateLimitKey), 0, $this->maxKeyLength);
+            }
+
+            $this->rateLimitCacheKey = $rateLimitKey;
+        }
+    }
+}
diff --git a/3rdparty/jwt/ExpiredException.php b/3rdparty/jwt/ExpiredException.php
index 3597370a..81ba52d4 100644
--- a/3rdparty/jwt/ExpiredException.php
+++ b/3rdparty/jwt/ExpiredException.php
@@ -1,7 +1,7 @@
 <?php
+
 namespace Firebase\JWT;
 
 class ExpiredException extends \UnexpectedValueException
 {
-
 }
diff --git a/3rdparty/jwt/JWK.php b/3rdparty/jwt/JWK.php
new file mode 100644
index 00000000..c7eff8ae
--- /dev/null
+++ b/3rdparty/jwt/JWK.php
@@ -0,0 +1,323 @@
+<?php
+
+namespace Firebase\JWT;
+
+use DomainException;
+use InvalidArgumentException;
+use UnexpectedValueException;
+
+/**
+ * JSON Web Key implementation, based on this spec:
+ * https://tools.ietf.org/html/draft-ietf-jose-json-web-key-41
+ *
+ * PHP version 5
+ *
+ * @category Authentication
+ * @package  Authentication_JWT
+ * @author   Bui Sy Nguyen <nguyenbs@gmail.com>
+ * @license  http://opensource.org/licenses/BSD-3-Clause 3-clause BSD
+ * @link     https://github.com/firebase/php-jwt
+ */
+class JWK
+{
+    private const OID = '1.2.840.10045.2.1';
+    private const ASN1_OBJECT_IDENTIFIER = 0x06;
+    private const ASN1_SEQUENCE = 0x10; // also defined in JWT
+    private const ASN1_BIT_STRING = 0x03;
+    private const EC_CURVES = [
+        'P-256' => '1.2.840.10045.3.1.7', // Len: 64
+        'secp256k1' => '1.3.132.0.10', // Len: 64
+        // 'P-384' => '1.3.132.0.34', // Len: 96 (not yet supported)
+        // 'P-521' => '1.3.132.0.35', // Len: 132 (not supported)
+    ];
+
+    /**
+     * Parse a set of JWK keys
+     *
+     * @param array<mixed> $jwks The JSON Web Key Set as an associative array
+     * @param string       $defaultAlg The algorithm for the Key object if "alg" is not set in the
+     *                                 JSON Web Key Set
+     *
+     * @return array<string, Key> An associative array of key IDs (kid) to Key objects
+     *
+     * @throws InvalidArgumentException     Provided JWK Set is empty
+     * @throws UnexpectedValueException     Provided JWK Set was invalid
+     * @throws DomainException              OpenSSL failure
+     *
+     * @uses parseKey
+     */
+    public static function parseKeySet(array $jwks, string $defaultAlg = null): array
+    {
+        $keys = [];
+
+        if (!isset($jwks['keys'])) {
+            throw new UnexpectedValueException('"keys" member must exist in the JWK Set');
+        }
+
+        if (empty($jwks['keys'])) {
+            throw new InvalidArgumentException('JWK Set did not contain any keys');
+        }
+
+        foreach ($jwks['keys'] as $k => $v) {
+            $kid = isset($v['kid']) ? $v['kid'] : $k;
+            if ($key = self::parseKey($v, $defaultAlg)) {
+                $keys[(string) $kid] = $key;
+            }
+        }
+
+        if (0 === \count($keys)) {
+            throw new UnexpectedValueException('No supported algorithms found in JWK Set');
+        }
+
+        return $keys;
+    }
+
+    /**
+     * Parse a JWK key
+     *
+     * @param array<mixed> $jwk An individual JWK
+     * @param string       $defaultAlg The algorithm for the Key object if "alg" is not set in the
+     *                                 JSON Web Key Set
+     *
+     * @return Key The key object for the JWK
+     *
+     * @throws InvalidArgumentException     Provided JWK is empty
+     * @throws UnexpectedValueException     Provided JWK was invalid
+     * @throws DomainException              OpenSSL failure
+     *
+     * @uses createPemFromModulusAndExponent
+     */
+    public static function parseKey(array $jwk, string $defaultAlg = null): ?Key
+    {
+        if (empty($jwk)) {
+            throw new InvalidArgumentException('JWK must not be empty');
+        }
+
+        if (!isset($jwk['kty'])) {
+            throw new UnexpectedValueException('JWK must contain a "kty" parameter');
+        }
+
+        if (!isset($jwk['alg'])) {
+            if (\is_null($defaultAlg)) {
+                // The "alg" parameter is optional in a KTY, but an algorithm is required
+                // for parsing in this library. Use the $defaultAlg parameter when parsing the
+                // key set in order to prevent this error.
+                // @see https://datatracker.ietf.org/doc/html/rfc7517#section-4.4
+                throw new UnexpectedValueException('JWK must contain an "alg" parameter');
+            }
+            $jwk['alg'] = $defaultAlg;
+        }
+
+        switch ($jwk['kty']) {
+            case 'RSA':
+                if (!empty($jwk['d'])) {
+                    throw new UnexpectedValueException('RSA private keys are not supported');
+                }
+                if (!isset($jwk['n']) || !isset($jwk['e'])) {
+                    throw new UnexpectedValueException('RSA keys must contain values for both "n" and "e"');
+                }
+
+                $pem = self::createPemFromModulusAndExponent($jwk['n'], $jwk['e']);
+                $publicKey = \openssl_pkey_get_public($pem);
+                if (false === $publicKey) {
+                    throw new DomainException(
+                        'OpenSSL error: ' . \openssl_error_string()
+                    );
+                }
+                return new Key($publicKey, $jwk['alg']);
+            case 'EC':
+                if (isset($jwk['d'])) {
+                    // The key is actually a private key
+                    throw new UnexpectedValueException('Key data must be for a public key');
+                }
+
+                if (empty($jwk['crv'])) {
+                    throw new UnexpectedValueException('crv not set');
+                }
+
+                if (!isset(self::EC_CURVES[$jwk['crv']])) {
+                    throw new DomainException('Unrecognised or unsupported EC curve');
+                }
+
+                if (empty($jwk['x']) || empty($jwk['y'])) {
+                    throw new UnexpectedValueException('x and y not set');
+                }
+
+                $publicKey = self::createPemFromCrvAndXYCoordinates($jwk['crv'], $jwk['x'], $jwk['y']);
+                return new Key($publicKey, $jwk['alg']);
+            default:
+                // Currently only RSA is supported
+                break;
+        }
+
+        return null;
+    }
+
+    /**
+     * Converts the EC JWK values to pem format.
+     *
+     * @param   string  $crv The EC curve (only P-256 is supported)
+     * @param   string  $x   The EC x-coordinate
+     * @param   string  $y   The EC y-coordinate
+     *
+     * @return  string
+     */
+    private static function createPemFromCrvAndXYCoordinates(string $crv, string $x, string $y): string
+    {
+        $pem =
+            self::encodeDER(
+                self::ASN1_SEQUENCE,
+                self::encodeDER(
+                    self::ASN1_SEQUENCE,
+                    self::encodeDER(
+                        self::ASN1_OBJECT_IDENTIFIER,
+                        self::encodeOID(self::OID)
+                    )
+                    . self::encodeDER(
+                        self::ASN1_OBJECT_IDENTIFIER,
+                        self::encodeOID(self::EC_CURVES[$crv])
+                    )
+                ) .
+                self::encodeDER(
+                    self::ASN1_BIT_STRING,
+                    \chr(0x00) . \chr(0x04)
+                    . JWT::urlsafeB64Decode($x)
+                    . JWT::urlsafeB64Decode($y)
+                )
+            );
+
+        return sprintf(
+            "-----BEGIN PUBLIC KEY-----\n%s\n-----END PUBLIC KEY-----\n",
+            wordwrap(base64_encode($pem), 64, "\n", true)
+        );
+    }
+
+    /**
+     * Create a public key represented in PEM format from RSA modulus and exponent information
+     *
+     * @param string $n The RSA modulus encoded in Base64
+     * @param string $e The RSA exponent encoded in Base64
+     *
+     * @return string The RSA public key represented in PEM format
+     *
+     * @uses encodeLength
+     */
+    private static function createPemFromModulusAndExponent(
+        string $n,
+        string $e
+    ): string {
+        $mod = JWT::urlsafeB64Decode($n);
+        $exp = JWT::urlsafeB64Decode($e);
+
+        $modulus = \pack('Ca*a*', 2, self::encodeLength(\strlen($mod)), $mod);
+        $publicExponent = \pack('Ca*a*', 2, self::encodeLength(\strlen($exp)), $exp);
+
+        $rsaPublicKey = \pack(
+            'Ca*a*a*',
+            48,
+            self::encodeLength(\strlen($modulus) + \strlen($publicExponent)),
+            $modulus,
+            $publicExponent
+        );
+
+        // sequence(oid(1.2.840.113549.1.1.1), null)) = rsaEncryption.
+        $rsaOID = \pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
+        $rsaPublicKey = \chr(0) . $rsaPublicKey;
+        $rsaPublicKey = \chr(3) . self::encodeLength(\strlen($rsaPublicKey)) . $rsaPublicKey;
+
+        $rsaPublicKey = \pack(
+            'Ca*a*',
+            48,
+            self::encodeLength(\strlen($rsaOID . $rsaPublicKey)),
+            $rsaOID . $rsaPublicKey
+        );
+
+        return "-----BEGIN PUBLIC KEY-----\r\n" .
+            \chunk_split(\base64_encode($rsaPublicKey), 64) .
+            '-----END PUBLIC KEY-----';
+    }
+
+    /**
+     * DER-encode the length
+     *
+     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
+     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
+     *
+     * @param int $length
+     * @return string
+     */
+    private static function encodeLength(int $length): string
+    {
+        if ($length <= 0x7F) {
+            return \chr($length);
+        }
+
+        $temp = \ltrim(\pack('N', $length), \chr(0));
+
+        return \pack('Ca*', 0x80 | \strlen($temp), $temp);
+    }
+
+    /**
+     * Encodes a value into a DER object.
+     * Also defined in Firebase\JWT\JWT
+     *
+     * @param   int     $type DER tag
+     * @param   string  $value the value to encode
+     * @return  string  the encoded object
+     */
+    private static function encodeDER(int $type, string $value): string
+    {
+        $tag_header = 0;
+        if ($type === self::ASN1_SEQUENCE) {
+            $tag_header |= 0x20;
+        }
+
+        // Type
+        $der = \chr($tag_header | $type);
+
+        // Length
+        $der .= \chr(\strlen($value));
+
+        return $der . $value;
+    }
+
+    /**
+     * Encodes a string into a DER-encoded OID.
+     *
+     * @param   string $oid the OID string
+     * @return  string the binary DER-encoded OID
+     */
+    private static function encodeOID(string $oid): string
+    {
+        $octets = explode('.', $oid);
+
+        // Get the first octet
+        $first = (int) array_shift($octets);
+        $second = (int) array_shift($octets);
+        $oid = \chr($first * 40 + $second);
+
+        // Iterate over subsequent octets
+        foreach ($octets as $octet) {
+            if ($octet == 0) {
+                $oid .= \chr(0x00);
+                continue;
+            }
+            $bin = '';
+
+            while ($octet) {
+                $bin .= \chr(0x80 | ($octet & 0x7f));
+                $octet >>= 7;
+            }
+            $bin[0] = $bin[0] & \chr(0x7f);
+
+            // Convert to big endian if necessary
+            if (pack('V', 65534) == pack('L', 65534)) {
+                $oid .= strrev($bin);
+            } else {
+                $oid .= $bin;
+            }
+        }
+
+        return $oid;
+    }
+}
diff --git a/3rdparty/jwt/JWT.php b/3rdparty/jwt/JWT.php
index 6d30e941..269e8caf 100644
--- a/3rdparty/jwt/JWT.php
+++ b/3rdparty/jwt/JWT.php
@@ -1,14 +1,20 @@
 <?php
 
 namespace Firebase\JWT;
-use \DomainException;
-use \InvalidArgumentException;
-use \UnexpectedValueException;
-use \DateTime;
+
+use ArrayAccess;
+use DateTime;
+use DomainException;
+use Exception;
+use InvalidArgumentException;
+use OpenSSLAsymmetricKey;
+use OpenSSLCertificate;
+use stdClass;
+use UnexpectedValueException;
 
 /**
  * JSON Web Token implementation, based on this spec:
- * http://tools.ietf.org/html/draft-ietf-oauth-json-web-token-06
+ * https://tools.ietf.org/html/rfc7519
  *
  * PHP version 5
  *
@@ -21,40 +27,58 @@
  */
 class JWT
 {
+    private const ASN1_INTEGER = 0x02;
+    private const ASN1_SEQUENCE = 0x10;
+    private const ASN1_BIT_STRING = 0x03;
 
     /**
      * When checking nbf, iat or expiration times,
      * we want to provide some extra leeway time to
      * account for clock skew.
+     *
+     * @var int
      */
     public static $leeway = 0;
 
     /**
      * Allow the current timestamp to be specified.
      * Useful for fixing a value within unit testing.
-     *
      * Will default to PHP time() value if null.
+     *
+     * @var ?int
      */
     public static $timestamp = null;
 
-    public static $supported_algs = array(
-        'HS256' => array('hash_hmac', 'SHA256'),
-        'HS512' => array('hash_hmac', 'SHA512'),
-        'HS384' => array('hash_hmac', 'SHA384'),
-        'RS256' => array('openssl', 'SHA256'),
-    );
+    /**
+     * @var array<string, string[]>
+     */
+    public static $supported_algs = [
+        'ES384' => ['openssl', 'SHA384'],
+        'ES256' => ['openssl', 'SHA256'],
+        'ES256K' => ['openssl', 'SHA256'],
+        'HS256' => ['hash_hmac', 'SHA256'],
+        'HS384' => ['hash_hmac', 'SHA384'],
+        'HS512' => ['hash_hmac', 'SHA512'],
+        'RS256' => ['openssl', 'SHA256'],
+        'RS384' => ['openssl', 'SHA384'],
+        'RS512' => ['openssl', 'SHA512'],
+        'EdDSA' => ['sodium_crypto', 'EdDSA'],
+    ];
 
     /**
      * Decodes a JWT string into a PHP object.
      *
-     * @param string        $jwt            The JWT
-     * @param string|array  $key            The key, or map of keys.
-     *                                      If the algorithm used is asymmetric, this is the public key
-     * @param array         $allowed_algs   List of supported verification algorithms
-     *                                      Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256'
+     * @param string                 $jwt            The JWT
+     * @param Key|array<string,Key> $keyOrKeyArray  The Key or associative array of key IDs (kid) to Key objects.
+     *                                               If the algorithm used is asymmetric, this is the public key
+     *                                               Each Key object contains an algorithm and matching key.
+     *                                               Supported algorithms are 'ES384','ES256', 'HS256', 'HS384',
+     *                                               'HS512', 'RS256', 'RS384', and 'RS512'
      *
-     * @return object The JWT's payload as a PHP object
+     * @return stdClass The JWT's payload as a PHP object
      *
+     * @throws InvalidArgumentException     Provided key/key-array was empty or malformed
+     * @throws DomainException              Provided JWT is malformed
      * @throws UnexpectedValueException     Provided JWT was invalid
      * @throws SignatureInvalidException    Provided JWT was invalid because the signature verification failed
      * @throws BeforeValidException         Provided JWT is trying to be used before it's eligible as defined by 'nbf'
@@ -64,56 +88,64 @@ class JWT
      * @uses jsonDecode
      * @uses urlsafeB64Decode
      */
-    public static function decode($jwt, $key, $allowed_algs = array())
-    {
-        $timestamp = is_null(static::$timestamp) ? time() : static::$timestamp;
+    public static function decode(
+        string $jwt,
+        $keyOrKeyArray
+    ): stdClass {
+        // Validate JWT
+        $timestamp = \is_null(static::$timestamp) ? \time() : static::$timestamp;
 
-        if (empty($key)) {
+        if (empty($keyOrKeyArray)) {
             throw new InvalidArgumentException('Key may not be empty');
         }
-        if (!is_array($allowed_algs)) {
-            throw new InvalidArgumentException('Algorithm not allowed');
-        }
-        $tks = explode('.', $jwt);
-        if (count($tks) != 3) {
+        $tks = \explode('.', $jwt);
+        if (\count($tks) !== 3) {
             throw new UnexpectedValueException('Wrong number of segments');
         }
         list($headb64, $bodyb64, $cryptob64) = $tks;
-        if (null === ($header = static::jsonDecode(static::urlsafeB64Decode($headb64)))) {
+        $headerRaw = static::urlsafeB64Decode($headb64);
+        if (null === ($header = static::jsonDecode($headerRaw))) {
             throw new UnexpectedValueException('Invalid header encoding');
         }
-        if (null === $payload = static::jsonDecode(static::urlsafeB64Decode($bodyb64))) {
+        $payloadRaw = static::urlsafeB64Decode($bodyb64);
+        if (null === ($payload = static::jsonDecode($payloadRaw))) {
             throw new UnexpectedValueException('Invalid claims encoding');
         }
+        if (\is_array($payload)) {
+            // prevent PHP Fatal Error in edge-cases when payload is empty array
+            $payload = (object) $payload;
+        }
+        if (!$payload instanceof stdClass) {
+            throw new UnexpectedValueException('Payload must be a JSON object');
+        }
         $sig = static::urlsafeB64Decode($cryptob64);
-        
         if (empty($header->alg)) {
             throw new UnexpectedValueException('Empty algorithm');
         }
         if (empty(static::$supported_algs[$header->alg])) {
             throw new UnexpectedValueException('Algorithm not supported');
         }
-        if (!in_array($header->alg, $allowed_algs)) {
-            throw new UnexpectedValueException('Algorithm not allowed');
+
+        $key = self::getKey($keyOrKeyArray, property_exists($header, 'kid') ? $header->kid : null);
+
+        // Check the algorithm
+        if (!self::constantTimeEquals($key->getAlgorithm(), $header->alg)) {
+            // See issue #351
+            throw new UnexpectedValueException('Incorrect key for this algorithm');
         }
-        if (is_array($key) || $key instanceof \ArrayAccess) {
-            if (isset($header->kid)) {
-                $key = $key[$header->kid];
-            } else {
-                throw new UnexpectedValueException('"kid" empty, unable to lookup correct key');
-            }
+        if (\in_array($header->alg, ['ES256', 'ES256K', 'ES384'], true)) {
+            // OpenSSL expects an ASN.1 DER sequence for ES256/ES256K/ES384 signatures
+            $sig = self::signatureToDER($sig);
         }
-
-        // Check the signature
-        if (!static::verify("$headb64.$bodyb64", $sig, $key, $header->alg)) {
+        if (!self::verify("{$headb64}.{$bodyb64}", $sig, $key->getKeyMaterial(), $header->alg)) {
             throw new SignatureInvalidException('Signature verification failed');
         }
 
-        // Check if the nbf if it is defined. This is the time that the
+        // Check the nbf if it is defined. This is the time that the
         // token can actually be used. If it's not yet that time, abort.
         if (isset($payload->nbf) && $payload->nbf > ($timestamp + static::$leeway)) {
             throw new BeforeValidException(
-                'Cannot handle token prior to ' . date(DateTime::ISO8601, $payload->nbf)
+                'Cannot handle token prior to ' . \date(DateTime::ISO8601, $payload->nbf)
             );
         }
 
@@ -122,7 +154,7 @@ public static function decode($jwt, $key, $allowed_algs = array())
         // correctly used the nbf claim).
         if (isset($payload->iat) && $payload->iat > ($timestamp + static::$leeway)) {
             throw new BeforeValidException(
-                'Cannot handle token prior to ' . date(DateTime::ISO8601, $payload->iat)
+                'Cannot handle token prior to ' . \date(DateTime::ISO8601, $payload->iat)
             );
         }
 
@@ -135,116 +167,172 @@ public static function decode($jwt, $key, $allowed_algs = array())
     }
 
     /**
-     * Converts and signs a PHP object or array into a JWT string.
+     * Converts and signs a PHP array into a JWT string.
      *
-     * @param object|array  $payload    PHP object or array
-     * @param string        $key        The secret key.
-     *                                  If the algorithm used is asymmetric, this is the private key
-     * @param string        $alg        The signing algorithm.
-     *                                  Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256'
-     * @param mixed         $keyId
-     * @param array         $head       An array with header elements to attach
+     * @param array<mixed>          $payload PHP array
+     * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate $key The secret key.
+     * @param string                $alg     Supported algorithms are 'ES384','ES256', 'ES256K', 'HS256',
+     *                                       'HS384', 'HS512', 'RS256', 'RS384', and 'RS512'
+     * @param string                $keyId
+     * @param array<string, string> $head    An array with header elements to attach
      *
      * @return string A signed JWT
      *
      * @uses jsonEncode
      * @uses urlsafeB64Encode
      */
-    public static function encode($payload, $key, $alg = 'HS256', $keyId = null, $head = null)
-    {
-        $header = array('typ' => 'JWT', 'alg' => $alg);
+    public static function encode(
+        array $payload,
+        $key,
+        string $alg,
+        string $keyId = null,
+        array $head = null
+    ): string {
+        $header = ['typ' => 'JWT', 'alg' => $alg];
         if ($keyId !== null) {
             $header['kid'] = $keyId;
         }
-        if ( isset($head) && is_array($head) ) {
-            $header = array_merge($head, $header);
+        if (isset($head) && \is_array($head)) {
+            $header = \array_merge($head, $header);
         }
-        $segments = array();
-        $segments[] = static::urlsafeB64Encode(static::jsonEncode($header));
-        $segments[] = static::urlsafeB64Encode(static::jsonEncode($payload));
-        $signing_input = implode('.', $segments);
+        $segments = [];
+        $segments[] = static::urlsafeB64Encode((string) static::jsonEncode($header));
+        $segments[] = static::urlsafeB64Encode((string) static::jsonEncode($payload));
+        $signing_input = \implode('.', $segments);
 
         $signature = static::sign($signing_input, $key, $alg);
         $segments[] = static::urlsafeB64Encode($signature);
 
-        return implode('.', $segments);
+        return \implode('.', $segments);
     }
 
     /**
      * Sign a string with a given key and algorithm.
      *
-     * @param string            $msg    The message to sign
-     * @param string|resource   $key    The secret key
-     * @param string            $alg    The signing algorithm.
-     *                                  Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256'
+     * @param string $msg  The message to sign
+     * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate  $key  The secret key.
+     * @param string $alg  Supported algorithms are 'ES384','ES256', 'ES256K', 'HS256',
+     *                    'HS384', 'HS512', 'RS256', 'RS384', and 'RS512'
      *
      * @return string An encrypted message
      *
-     * @throws DomainException Unsupported algorithm was specified
+     * @throws DomainException Unsupported algorithm or bad key was specified
      */
-    public static function sign($msg, $key, $alg = 'HS256')
-    {
+    public static function sign(
+        string $msg,
+        $key,
+        string $alg
+    ): string {
         if (empty(static::$supported_algs[$alg])) {
             throw new DomainException('Algorithm not supported');
         }
         list($function, $algorithm) = static::$supported_algs[$alg];
-        switch($function) {
+        switch ($function) {
             case 'hash_hmac':
-                return hash_hmac($algorithm, $msg, $key, true);
+                if (!\is_string($key)) {
+                    throw new InvalidArgumentException('key must be a string when using hmac');
+                }
+                return \hash_hmac($algorithm, $msg, $key, true);
             case 'openssl':
                 $signature = '';
-                $success = openssl_sign($msg, $signature, $key, $algorithm);
+                $success = \openssl_sign($msg, $signature, $key, $algorithm); // @phpstan-ignore-line
                 if (!$success) {
-                    throw new DomainException("OpenSSL unable to sign data");
-                } else {
-                    return $signature;
+                    throw new DomainException('OpenSSL unable to sign data');
+                }
+                if ($alg === 'ES256' || $alg === 'ES256K') {
+                    $signature = self::signatureFromDER($signature, 256);
+                } elseif ($alg === 'ES384') {
+                    $signature = self::signatureFromDER($signature, 384);
+                }
+                return $signature;
+            case 'sodium_crypto':
+                if (!\function_exists('sodium_crypto_sign_detached')) {
+                    throw new DomainException('libsodium is not available');
+                }
+                if (!\is_string($key)) {
+                    throw new InvalidArgumentException('key must be a string when using EdDSA');
+                }
+                try {
+                    // The last non-empty line is used as the key.
+                    $lines = array_filter(explode("\n", $key));
+                    $key = base64_decode((string) end($lines));
+                    if (\strlen($key) === 0) {
+                        throw new DomainException('Key cannot be empty string');
+                    }
+                    return sodium_crypto_sign_detached($msg, $key);
+                } catch (Exception $e) {
+                    throw new DomainException($e->getMessage(), 0, $e);
                 }
         }
+
+        throw new DomainException('Algorithm not supported');
     }
 
     /**
      * Verify a signature with the message, key and method. Not all methods
      * are symmetric, so we must have a separate verify and sign method.
      *
-     * @param string            $msg        The original message (header and body)
-     * @param string            $signature  The original signature
-     * @param string|resource   $key        For HS*, a string key works. for RS*, must be a resource of an openssl public key
-     * @param string            $alg        The algorithm
+     * @param string $msg         The original message (header and body)
+     * @param string $signature   The original signature
+     * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate  $keyMaterial For HS*, a string key works. for RS*, must be an instance of OpenSSLAsymmetricKey
+     * @param string $alg         The algorithm
      *
      * @return bool
      *
-     * @throws DomainException Invalid Algorithm or OpenSSL failure
+     * @throws DomainException Invalid Algorithm, bad key, or OpenSSL failure
      */
-    private static function verify($msg, $signature, $key, $alg)
-    {
+    private static function verify(
+        string $msg,
+        string $signature,
+        $keyMaterial,
+        string $alg
+    ): bool {
         if (empty(static::$supported_algs[$alg])) {
             throw new DomainException('Algorithm not supported');
         }
 
         list($function, $algorithm) = static::$supported_algs[$alg];
-        switch($function) {
+        switch ($function) {
             case 'openssl':
-                $success = openssl_verify($msg, $signature, $key, $algorithm);
-                if (!$success) {
-                    throw new DomainException("OpenSSL unable to verify data: " . openssl_error_string());
-                } else {
-                    return $signature;
+                $success = \openssl_verify($msg, $signature, $keyMaterial, $algorithm); // @phpstan-ignore-line
+                if ($success === 1) {
+                    return true;
+                }
+                if ($success === 0) {
+                    return false;
+                }
+                // returns 1 on success, 0 on failure, -1 on error.
+                throw new DomainException(
+                    'OpenSSL error: ' . \openssl_error_string()
+                );
+            case 'sodium_crypto':
+                if (!\function_exists('sodium_crypto_sign_verify_detached')) {
+                    throw new DomainException('libsodium is not available');
+                }
+                if (!\is_string($keyMaterial)) {
+                    throw new InvalidArgumentException('key must be a string when using EdDSA');
+                }
+                try {
+                    // The last non-empty line is used as the key.
+                    $lines = array_filter(explode("\n", $keyMaterial));
+                    $key = base64_decode((string) end($lines));
+                    if (\strlen($key) === 0) {
+                        throw new DomainException('Key cannot be empty string');
+                    }
+                    if (\strlen($signature) === 0) {
+                        throw new DomainException('Signature cannot be empty string');
+                    }
+                    return sodium_crypto_sign_verify_detached($signature, $msg, $key);
+                } catch (Exception $e) {
+                    throw new DomainException($e->getMessage(), 0, $e);
                 }
             case 'hash_hmac':
             default:
-                $hash = hash_hmac($algorithm, $msg, $key, true);
-                if (function_exists('hash_equals')) {
-                    return hash_equals($signature, $hash);
+                if (!\is_string($keyMaterial)) {
+                    throw new InvalidArgumentException('key must be a string when using hmac');
                 }
-                $len = min(static::safeStrlen($signature), static::safeStrlen($hash));
-
-                $status = 0;
-                for ($i = 0; $i < $len; $i++) {
-                    $status |= (ord($signature[$i]) ^ ord($hash[$i]));
-                }
-                $status |= (static::safeStrlen($signature) ^ static::safeStrlen($hash));
-
-                return ($status === 0);
+                $hash = \hash_hmac($algorithm, $msg, $keyMaterial, true);
+                return self::constantTimeEquals($hash, $signature);
         }
     }
 
@@ -253,30 +341,16 @@ private static function verify($msg, $signature, $key, $alg)
      *
      * @param string $input JSON string
      *
-     * @return object Object representation of JSON string
+     * @return mixed The decoded JSON string
      *
      * @throws DomainException Provided string was invalid JSON
      */
-    public static function jsonDecode($input)
+    public static function jsonDecode(string $input)
     {
-        if (version_compare(PHP_VERSION, '5.4.0', '>=') && !(defined('JSON_C_VERSION') && PHP_INT_SIZE > 4)) {
-            /** In PHP >=5.4.0, json_decode() accepts an options parameter, that allows you
-             * to specify that large ints (like Steam Transaction IDs) should be treated as
-             * strings, rather than the PHP default behaviour of converting them to floats.
-             */
-            $obj = json_decode($input, false, 512, JSON_BIGINT_AS_STRING);
-        } else {
-            /** Not all servers will support that, however, so for older versions we must
-             * manually detect large ints in the JSON string and quote them (thus converting
-             *them to strings) before decoding, hence the preg_replace() call.
-             */
-            $max_int_length = strlen((string) PHP_INT_MAX) - 1;
-            $json_without_bigints = preg_replace('/:\s*(-?\d{'.$max_int_length.',})/', ': "$1"', $input);
-            $obj = json_decode($json_without_bigints);
-        }
+        $obj = \json_decode($input, false, 512, JSON_BIGINT_AS_STRING);
 
-        if (function_exists('json_last_error') && $errno = json_last_error()) {
-            static::handleJsonError($errno);
+        if ($errno = \json_last_error()) {
+            self::handleJsonError($errno);
         } elseif ($obj === null && $input !== 'null') {
             throw new DomainException('Null result with non-null input');
         }
@@ -284,22 +358,30 @@ public static function jsonDecode($input)
     }
 
     /**
-     * Encode a PHP object into a JSON string.
+     * Encode a PHP array into a JSON string.
      *
-     * @param object|array $input A PHP object or array
+     * @param array<mixed> $input A PHP array
      *
-     * @return string JSON representation of the PHP object or array
+     * @return string JSON representation of the PHP array
      *
      * @throws DomainException Provided object could not be encoded to valid JSON
      */
-    public static function jsonEncode($input)
+    public static function jsonEncode(array $input): string
     {
-        $json = json_encode($input);
-        if (function_exists('json_last_error') && $errno = json_last_error()) {
-            static::handleJsonError($errno);
+        if (PHP_VERSION_ID >= 50400) {
+            $json = \json_encode($input, \JSON_UNESCAPED_SLASHES);
+        } else {
+            // PHP 5.3 only
+            $json = \json_encode($input);
+        }
+        if ($errno = \json_last_error()) {
+            self::handleJsonError($errno);
         } elseif ($json === 'null' && $input !== null) {
             throw new DomainException('Null result with non-null input');
         }
+        if ($json === false) {
+            throw new DomainException('Provided object could not be encoded to valid JSON');
+        }
         return $json;
     }
 
@@ -309,15 +391,17 @@ public static function jsonEncode($input)
      * @param string $input A Base64 encoded string
      *
      * @return string A decoded string
+     *
+     * @throws InvalidArgumentException invalid base64 characters
      */
-    public static function urlsafeB64Decode($input)
+    public static function urlsafeB64Decode(string $input): string
     {
-        $remainder = strlen($input) % 4;
+        $remainder = \strlen($input) % 4;
         if ($remainder) {
             $padlen = 4 - $remainder;
-            $input .= str_repeat('=', $padlen);
+            $input .= \str_repeat('=', $padlen);
         }
-        return base64_decode(strtr($input, '-_', '+/'));
+        return \base64_decode(\strtr($input, '-_', '+/'));
     }
 
     /**
@@ -327,9 +411,65 @@ public static function urlsafeB64Decode($input)
      *
      * @return string The base64 encode of what you passed in
      */
-    public static function urlsafeB64Encode($input)
+    public static function urlsafeB64Encode(string $input): string
+    {
+        return \str_replace('=', '', \strtr(\base64_encode($input), '+/', '-_'));
+    }
+
+
+    /**
+     * Determine if an algorithm has been provided for each Key
+     *
+     * @param Key|ArrayAccess<string,Key>|array<string,Key> $keyOrKeyArray
+     * @param string|null            $kid
+     *
+     * @throws UnexpectedValueException
+     *
+     * @return Key
+     */
+    private static function getKey(
+        $keyOrKeyArray,
+        ?string $kid
+    ): Key {
+        if ($keyOrKeyArray instanceof Key) {
+            return $keyOrKeyArray;
+        }
+
+        if (empty($kid)) {
+            throw new UnexpectedValueException('"kid" empty, unable to lookup correct key');
+        }
+
+        if ($keyOrKeyArray instanceof CachedKeySet) {
+            // Skip "isset" check, as this will automatically refresh if not set
+            return $keyOrKeyArray[$kid];
+        }
+
+        if (!isset($keyOrKeyArray[$kid])) {
+            throw new UnexpectedValueException('"kid" invalid, unable to lookup correct key');
+        }
+
+        return $keyOrKeyArray[$kid];
+    }
+
+    /**
+     * @param string $left  The string of known length to compare against
+     * @param string $right The user-supplied string
+     * @return bool
+     */
+    public static function constantTimeEquals(string $left, string $right): bool
     {
-        return str_replace('=', '', strtr(base64_encode($input), '+/', '-_'));
+        if (\function_exists('hash_equals')) {
+            return \hash_equals($left, $right);
+        }
+        $len = \min(self::safeStrlen($left), self::safeStrlen($right));
+
+        $status = 0;
+        for ($i = 0; $i < $len; $i++) {
+            $status |= (\ord($left[$i]) ^ \ord($right[$i]));
+        }
+        $status |= (self::safeStrlen($left) ^ self::safeStrlen($right));
+
+        return ($status === 0);
     }
 
     /**
@@ -337,15 +477,19 @@ public static function urlsafeB64Encode($input)
      *
      * @param int $errno An error number from json_last_error()
      *
+     * @throws DomainException
+     *
      * @return void
      */
-    private static function handleJsonError($errno)
+    private static function handleJsonError(int $errno): void
     {
-        $messages = array(
+        $messages = [
             JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
+            JSON_ERROR_STATE_MISMATCH => 'Invalid or malformed JSON',
             JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
-            JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON'
-        );
+            JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON',
+            JSON_ERROR_UTF8 => 'Malformed UTF-8 characters' //PHP >= 5.3.3
+        ];
         throw new DomainException(
             isset($messages[$errno])
             ? $messages[$errno]
@@ -356,15 +500,139 @@ private static function handleJsonError($errno)
     /**
      * Get the number of bytes in cryptographic strings.
      *
-     * @param string
+     * @param string $str
      *
      * @return int
      */
-    private static function safeStrlen($str)
+    private static function safeStrlen(string $str): int
+    {
+        if (\function_exists('mb_strlen')) {
+            return \mb_strlen($str, '8bit');
+        }
+        return \strlen($str);
+    }
+
+    /**
+     * Convert an ECDSA signature to an ASN.1 DER sequence
+     *
+     * @param   string $sig The ECDSA signature to convert
+     * @return  string The encoded DER object
+     */
+    private static function signatureToDER(string $sig): string
+    {
+        // Separate the signature into r-value and s-value
+        $length = max(1, (int) (\strlen($sig) / 2));
+        list($r, $s) = \str_split($sig, $length);
+
+        // Trim leading zeros
+        $r = \ltrim($r, "\x00");
+        $s = \ltrim($s, "\x00");
+
+        // Convert r-value and s-value from unsigned big-endian integers to
+        // signed two's complement
+        if (\ord($r[0]) > 0x7f) {
+            $r = "\x00" . $r;
+        }
+        if (\ord($s[0]) > 0x7f) {
+            $s = "\x00" . $s;
+        }
+
+        return self::encodeDER(
+            self::ASN1_SEQUENCE,
+            self::encodeDER(self::ASN1_INTEGER, $r) .
+            self::encodeDER(self::ASN1_INTEGER, $s)
+        );
+    }
+
+    /**
+     * Encodes a value into a DER object.
+     *
+     * @param   int     $type DER tag
+     * @param   string  $value the value to encode
+     *
+     * @return  string  the encoded object
+     */
+    private static function encodeDER(int $type, string $value): string
+    {
+        $tag_header = 0;
+        if ($type === self::ASN1_SEQUENCE) {
+            $tag_header |= 0x20;
+        }
+
+        // Type
+        $der = \chr($tag_header | $type);
+
+        // Length
+        $der .= \chr(\strlen($value));
+
+        return $der . $value;
+    }
+
+    /**
+     * Encodes signature from a DER object.
+     *
+     * @param   string  $der binary signature in DER format
+     * @param   int     $keySize the number of bits in the key
+     *
+     * @return  string  the signature
+     */
+    private static function signatureFromDER(string $der, int $keySize): string
+    {
+        // OpenSSL returns the ECDSA signatures as a binary ASN.1 DER SEQUENCE
+        list($offset, $_) = self::readDER($der);
+        list($offset, $r) = self::readDER($der, $offset);
+        list($offset, $s) = self::readDER($der, $offset);
+
+        // Convert r-value and s-value from signed two's compliment to unsigned
+        // big-endian integers
+        $r = \ltrim($r, "\x00");
+        $s = \ltrim($s, "\x00");
+
+        // Pad out r and s so that they are $keySize bits long
+        $r = \str_pad($r, $keySize / 8, "\x00", STR_PAD_LEFT);
+        $s = \str_pad($s, $keySize / 8, "\x00", STR_PAD_LEFT);
+
+        return $r . $s;
+    }
+
+    /**
+     * Reads binary DER-encoded data and decodes into a single object
+     *
+     * @param string $der the binary data in DER format
+     * @param int $offset the offset of the data stream containing the object
+     * to decode
+     *
+     * @return array{int, string|null} the new offset and the decoded object
+     */
+    private static function readDER(string $der, int $offset = 0): array
     {
-        if (function_exists('mb_strlen')) {
-            return mb_strlen($str, '8bit');
+        $pos = $offset;
+        $size = \strlen($der);
+        $constructed = (\ord($der[$pos]) >> 5) & 0x01;
+        $type = \ord($der[$pos++]) & 0x1f;
+
+        // Length
+        $len = \ord($der[$pos++]);
+        if ($len & 0x80) {
+            $n = $len & 0x1f;
+            $len = 0;
+            while ($n-- && $pos < $size) {
+                $len = ($len << 8) | \ord($der[$pos++]);
+            }
         }
-        return strlen($str);
+
+        // Value
+        if ($type === self::ASN1_BIT_STRING) {
+            $pos++; // Skip the first contents octet (padding indicator)
+            $data = \substr($der, $pos, $len - 1);
+            $pos += $len - 1;
+        } elseif (!$constructed) {
+            $data = \substr($der, $pos, $len);
+            $pos += $len;
+        } else {
+            $data = null;
+        }
+
+        return [$pos, $data];
     }
 }
diff --git a/3rdparty/jwt/Key.php b/3rdparty/jwt/Key.php
new file mode 100644
index 00000000..00cf7f2e
--- /dev/null
+++ b/3rdparty/jwt/Key.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Firebase\JWT;
+
+use InvalidArgumentException;
+use OpenSSLAsymmetricKey;
+use OpenSSLCertificate;
+use TypeError;
+
+class Key
+{
+    /** @var string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate */
+    private $keyMaterial;
+    /** @var string */
+    private $algorithm;
+
+    /**
+     * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate $keyMaterial
+     * @param string $algorithm
+     */
+    public function __construct(
+        $keyMaterial,
+        string $algorithm
+    ) {
+        if (
+            !\is_string($keyMaterial)
+            && !$keyMaterial instanceof OpenSSLAsymmetricKey
+            && !$keyMaterial instanceof OpenSSLCertificate
+            && !\is_resource($keyMaterial)
+        ) {
+            throw new TypeError('Key material must be a string, resource, or OpenSSLAsymmetricKey');
+        }
+
+        if (empty($keyMaterial)) {
+            throw new InvalidArgumentException('Key material must not be empty');
+        }
+
+        if (empty($algorithm)) {
+            throw new InvalidArgumentException('Algorithm must not be empty');
+        }
+
+        // TODO: Remove in PHP 8.0 in favor of class constructor property promotion
+        $this->keyMaterial = $keyMaterial;
+        $this->algorithm = $algorithm;
+    }
+
+    /**
+     * Return the algorithm valid for this key
+     *
+     * @return string
+     */
+    public function getAlgorithm(): string
+    {
+        return $this->algorithm;
+    }
+
+    /**
+     * @return string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate
+     */
+    public function getKeyMaterial()
+    {
+        return $this->keyMaterial;
+    }
+}
diff --git a/3rdparty/jwt/LICENSE b/3rdparty/jwt/LICENSE
index cb0c49b3..11c01466 100644
--- a/3rdparty/jwt/LICENSE
+++ b/3rdparty/jwt/LICENSE
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
       disclaimer in the documentation and/or other materials provided
       with the distribution.
 
-    * Neither the name of Neuman Vong nor the names of other
+    * Neither the name of the copyright holder nor the names of other
       contributors may be used to endorse or promote products derived
       from this software without specific prior written permission.
 
diff --git a/3rdparty/jwt/SignatureInvalidException.php b/3rdparty/jwt/SignatureInvalidException.php
index 27332b21..d35dee9f 100644
--- a/3rdparty/jwt/SignatureInvalidException.php
+++ b/3rdparty/jwt/SignatureInvalidException.php
@@ -1,7 +1,7 @@
 <?php
+
 namespace Firebase\JWT;
 
 class SignatureInvalidException extends \UnexpectedValueException
 {
-
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a798c7aa..827616d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Change Log
 
+## 8.2.1
+## Added
+- jwt header setting
+- Paste Special to add a link between files
+- si-LK (Sinhala) language in local path mapping
+- Link to docs cloud
+- background job for checking editors availability
+
+## Changed
+- editing by shared link without configuring file protection, chat and without the possibility of mentioning
+- fileType to history data
+- change page title when editing a file
+- jwt library update
+- fileType parameter used in callback instead of extension from url (DocumentServer 7.0 required)
+
 ## 7.8.1
 ## Added
 - disable plugins setting
@@ -350,4 +365,4 @@
 - Nextcloud 11 compatibility
 
 ## 1.0.0
-- Initial release
\ No newline at end of file
+- Initial release
diff --git a/README.md b/README.md
index 149e085f..22321fd4 100644
--- a/README.md
+++ b/README.md
@@ -190,6 +190,23 @@ The instruction on enabling _master key_ based encryption is available in the of
     This will disable the certificate verification and allow ownCloud to establish connection with **Document Server**. 
 
     Please remember that this is a temporary insecure solution and we strongly recommend that you replace the certificate with the one issued by some CA. Once you do that, do not forget to uncheck the corresponding setting box or remove the above section from the ownCloud config file.
+
+* If the editors don't open or save documents after a period of proper functioning, the reason can be a problem in changing network settings or disabling any relevant services, or issues with the SSL certificate.
+    
+    To solve this, we added an asynchronous background task which runs on the server to check availability of the editors. It allows testing the connection between your **ownCloud instance** and **ONLYOFFICE Document Server**, namely availability of server addresses and the validity of the JWT secret are being checked.
+ 
+    If any issue is detected, the ONLYOFFICE integration connector (consequently, the ability to create and open files) will be disabled. As an ownCloud admin, you will get the corresponding notification. 
+
+    This option allows you to avoid issues when the server settings become incorrect and require changes.
+
+    By default, this background task runs once a day. If necessary, you can change the frequency. To do so, open the ownCloud config file (_/owncloud/config/config.php_). Insert the following section and enter the required value in minutes:
+
+    ```php
+    'onlyoffice' => array (
+        'editors_check_interval' => 3624
+    )
+    ```
+    To disable this check running, enter 0 value. 
     
 ## ONLYOFFICE Docs editions
 
@@ -263,4 +280,4 @@ The table below will help you to make the right choice.
 | Saving as PDF	                  | + | + |
 | | [Get it now](https://www.onlyoffice.com/download-docs.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubOwncloud#docs-community)  | [Start Free Trial](https://www.onlyoffice.com/download-docs.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubOwncloud#docs-enterprise)  |
 
-\* If supported by DMS.
\ No newline at end of file
+\* If supported by DMS.
diff --git a/appinfo/application.php b/appinfo/application.php
index ddf8afe3..3e0b9eaf 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -20,6 +20,7 @@
 namespace OCA\Onlyoffice\AppInfo;
 
 use OCP\AppFramework\App;
+use OCP\BackgroundJob\IJobList;
 use OCP\Files\IMimeTypeDetector;
 use OCP\Util;
 use OCP\IPreview;
@@ -29,6 +30,7 @@
 use OCA\Onlyoffice\Controller\CallbackController;
 use OCA\Onlyoffice\Controller\EditorApiController;
 use OCA\Onlyoffice\Controller\EditorController;
+use OCA\Onlyoffice\Controller\JobListController;
 use OCA\Onlyoffice\Controller\SettingsApiController;
 use OCA\Onlyoffice\Controller\SettingsController;
 use OCA\Onlyoffice\Controller\TemplateController;
@@ -89,7 +91,10 @@ function () {
         require_once __DIR__ . "/../3rdparty/jwt/BeforeValidException.php";
         require_once __DIR__ . "/../3rdparty/jwt/ExpiredException.php";
         require_once __DIR__ . "/../3rdparty/jwt/SignatureInvalidException.php";
+        require_once __DIR__ . "/../3rdparty/jwt/CachedKeySet.php";
         require_once __DIR__ . "/../3rdparty/jwt/JWT.php";
+        require_once __DIR__ . "/../3rdparty/jwt/JWK.php";
+        require_once __DIR__ . "/../3rdparty/jwt/Key.php";
 
         // Set the leeway for the JWT library in case the system clock is a second off
         \Firebase\JWT\JWT::$leeway = $this->appConfig->GetJwtLeeway();
@@ -237,6 +242,14 @@ function () {
             );
         });
 
+        $checkBackgroundJobs = new JobListController(
+            $container->query("AppName"),
+            $container->query("Request"),
+            $container->query("Logger"),
+            $this->appConfig,
+            $container->query(IJobList::class)
+        );
+        $checkBackgroundJobs->checkAllJobs();
 
         Hooks::connectHooks();
     }
diff --git a/appinfo/info.xml b/appinfo/info.xml
index a9bc34dd..4b0c4cd1 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -6,7 +6,7 @@
     <description>ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within ownCloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.</description>
     <licence>apl2</licence>
     <author>Ascensio System SIA</author>
-    <version>7.8.1</version>
+    <version>8.2.1</version>
     <namespace>Onlyoffice</namespace>
     <types>
         <filesystem/>
@@ -31,4 +31,7 @@
     <commands>
         <command>OCA\Onlyoffice\Command\DocumentServer</command>
     </commands>
+    <background-jobs>
+        <job>OCA\Onlyoffice\Cron\EditorsCheck</job>
+    </background-jobs>
 </info>
\ No newline at end of file
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 4698484f..1f9b0199 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -28,6 +28,7 @@
        ["name" => "editor#public_page", "url" => "/s/{shareToken}", "verb" => "GET"],
        ["name" => "editor#users", "url" => "/ajax/users", "verb" => "GET"],
        ["name" => "editor#mention", "url" => "/ajax/mention", "verb" => "POST"],
+       ["name" => "editor#reference", "url" => "/ajax/reference", "verb" => "POST"],
        ["name" => "editor#create", "url" => "/ajax/new", "verb" => "POST"],
        ["name" => "editor#convert", "url" => "/ajax/convert", "verb" => "POST"],
        ["name" => "editor#save", "url" => "/ajax/save", "verb" => "POST"],
diff --git a/assets b/assets
index 4b96e283..f00ab3a3 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 4b96e283924e0481299b6400520829649634c23e
+Subproject commit f00ab3a3efe6e2f8542ba026d1fc1d72df7dfd5f
diff --git a/controller/callbackcontroller.php b/controller/callbackcontroller.php
index 9d268c1c..05704c9f 100644
--- a/controller/callbackcontroller.php
+++ b/controller/callbackcontroller.php
@@ -206,7 +206,7 @@ public function download($doc) {
                 $header = substr($header, strlen("Bearer "));
 
                 try {
-                    $decodedHeader = \Firebase\JWT\JWT::decode($header, $this->config->GetDocumentServerSecret(), array("HS256"));
+                    $decodedHeader = \Firebase\JWT\JWT::decode($header, new \Firebase\JWT\Key($this->config->GetDocumentServerSecret(), "HS256"));
                 } catch (\UnexpectedValueException $e) {
                     $this->logger->logException($e, ["message" => "Download with invalid jwt", "app" => $this->appName]);
                     return new JSONResponse(["message" => $this->trans->t("Access denied")], Http::STATUS_FORBIDDEN);
@@ -343,7 +343,7 @@ public function emptyfile($doc) {
             $header = substr($header, strlen("Bearer "));
 
             try {
-                $decodedHeader = \Firebase\JWT\JWT::decode($header, $this->config->GetDocumentServerSecret(), array("HS256"));
+                $decodedHeader = \Firebase\JWT\JWT::decode($header, new \Firebase\JWT\Key($this->config->GetDocumentServerSecret(), "HS256"));
             } catch (\UnexpectedValueException $e) {
                 $this->logger->logException($e, ["message" => "Download empty with invalid jwt", "app" => $this->appName]);
                 return new JSONResponse(["message" => $this->trans->t("Access denied")], Http::STATUS_FORBIDDEN);
@@ -380,6 +380,7 @@ public function emptyfile($doc) {
      * @param string $changesurl - link to file changes
      * @param integer $forcesavetype - the type of force save action
      * @param array $actions - the array of action
+     * @param string $filetype - extension of the document that is downloaded from the link specified with the url parameter
      *
      * @return array
      *
@@ -388,7 +389,7 @@ public function emptyfile($doc) {
      * @PublicPage
      * @CORS
      */
-    public function track($doc, $users, $key, $status, $url, $token, $history, $changesurl, $forcesavetype, $actions) {
+    public function track($doc, $users, $key, $status, $url, $token, $history, $changesurl, $forcesavetype, $actions, $filetype) {
 
         list ($hashData, $error) = $this->crypt->ReadHash($doc);
         if ($hashData === null) {
@@ -406,7 +407,7 @@ public function track($doc, $users, $key, $status, $url, $token, $history, $chan
         if (!empty($this->config->GetDocumentServerSecret())) {
             if (!empty($token)) {
                 try {
-                    $payload = \Firebase\JWT\JWT::decode($token, $this->config->GetDocumentServerSecret(), array("HS256"));
+                    $payload = \Firebase\JWT\JWT::decode($token, new \Firebase\JWT\Key($this->config->GetDocumentServerSecret(), "HS256"));
                 } catch (\UnexpectedValueException $e) {
                     $this->logger->logException($e, ["message" => "Track with invalid jwt in body", "app" => $this->appName]);
                     return new JSONResponse(["message" => $this->trans->t("Access denied")], Http::STATUS_FORBIDDEN);
@@ -421,7 +422,7 @@ public function track($doc, $users, $key, $status, $url, $token, $history, $chan
                 $header = substr($header, strlen("Bearer "));
 
                 try {
-                    $decodedHeader = \Firebase\JWT\JWT::decode($header, $this->config->GetDocumentServerSecret(), array("HS256"));
+                    $decodedHeader = \Firebase\JWT\JWT::decode($header, new \Firebase\JWT\Key($this->config->GetDocumentServerSecret(), "HS256"));
 
                     $payload = $decodedHeader->payload;
                 } catch (\UnexpectedValueException $e) {
@@ -514,7 +515,7 @@ public function track($doc, $users, $key, $status, $url, $token, $history, $chan
                     $prevVersion = $file->getFileInfo()->getMtime();
                     $fileName = $file->getName();
                     $curExt = strtolower(pathinfo($fileName, PATHINFO_EXTENSION));
-                    $downloadExt = strtolower(pathinfo($url, PATHINFO_EXTENSION));
+                    $downloadExt = $filetype;
 
                     $documentService = new DocumentService($this->trans, $this->config);
                     if ($downloadExt !== $curExt) {
diff --git a/controller/editorapicontroller.php b/controller/editorapicontroller.php
index 0f35dd20..c836127c 100644
--- a/controller/editorapicontroller.php
+++ b/controller/editorapicontroller.php
@@ -301,6 +301,10 @@ public function config($fileId, $filePath = null, $shareToken = null, $version =
                 "permissions" => [],
                 "title" => $fileName,
                 "url" => $fileUrl,
+                "referenceData" => [
+                    "fileKey" => $file->getId(),
+                    "instanceId" => $this->config->GetSystemValue("instanceid", true),
+                ],
             ],
             "documentType" => $format["type"],
             "editorConfig" => [
@@ -392,10 +396,15 @@ public function config($fileId, $filePath = null, $shareToken = null, $version =
             }
             $params["document"]["permissions"]["protect"] = $canProtect;
 
+            if (isset($shareToken)) {
+                $params["document"]["permissions"]["chat"] = false;
+                $params["document"]["permissions"]["protect"] = false;
+            }
+
             $hashCallback = $this->crypt->GetHash(["userId" => $userId, "ownerId" => $ownerId, "fileId" => $file->getId(), "filePath" => $filePath, "shareToken" => $shareToken, "action" => "track"]);
             $callback = $this->urlGenerator->linkToRouteAbsolute($this->appName . ".callback.track", ["doc" => $hashCallback]);
 
-            if (!empty($this->config->GetStorageUrl())) {
+            if (!$this->config->UseDemo() && !empty($this->config->GetStorageUrl())) {
                 $callback = str_replace($this->urlGenerator->getAbsoluteURL("/"), $this->config->GetStorageUrl(), $callback);
             }
 
@@ -538,7 +547,7 @@ public function config($fileId, $filePath = null, $shareToken = null, $version =
         }
 
         if (!empty($this->config->GetDocumentServerSecret())) {
-            $token = \Firebase\JWT\JWT::encode($params, $this->config->GetDocumentServerSecret());
+            $token = \Firebase\JWT\JWT::encode($params, $this->config->GetDocumentServerSecret(), "HS256");
             $params["token"] = $token;
         }
 
@@ -635,7 +644,7 @@ private function getUrl($file, $user = null, $shareToken = null, $version = 0, $
 
         $fileUrl = $this->urlGenerator->linkToRouteAbsolute($this->appName . ".callback.download", ["doc" => $hashUrl]);
 
-        if (!empty($this->config->GetStorageUrl())) {
+        if (!$this->config->UseDemo() && !empty($this->config->GetStorageUrl())) {
             $fileUrl = str_replace($this->urlGenerator->getAbsoluteURL("/"), $this->config->GetStorageUrl(), $fileUrl);
         }
 
@@ -764,4 +773,4 @@ private function isFavorite($fileId) {
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index e97fab26..b21e6c92 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -264,7 +264,7 @@ public function create($name, $dir, $templateId = null, $targetPath = null, $sha
             $targetName = $targetFile->getName();
             $targetExt = strtolower(pathinfo($targetName, PATHINFO_EXTENSION));
             $targetKey = $this->fileUtility->getKey($targetFile);
-            
+
             $fileUrl = $this->getUrl($targetFile, $user, $shareToken);
 
             $ext = strtolower(pathinfo($name, PATHINFO_EXTENSION));
@@ -311,7 +311,7 @@ public function create($name, $dir, $templateId = null, $targetPath = null, $sha
      * @param string $name - file name
      * @param string $dir - folder path
      * @param string $templateId - file identifier
-     * 
+     *
      * @return TemplateResponse|RedirectResponse
      *
      * @NoAdminRequired
@@ -438,7 +438,7 @@ public function mention($fileId, $anchor, $comment, $emails) {
         foreach ($emails as $email) {
             $recipients = $this->userManager->getByEmail($email);
             foreach ($recipients as $recipient) {
-                $recipientId = $recipient->getUID(); 
+                $recipientId = $recipient->getUID();
                 if (!in_array($recipientId, $recipientIds)) {
                     array_push($recipientIds, $recipientId);
                 }
@@ -537,6 +537,75 @@ public function mention($fileId, $anchor, $comment, $emails) {
         return ["message" => $this->trans->t("Notification sent successfully")];
     }
 
+    /**
+     * Reference data
+     *
+     * @param array $referenceData - reference data
+     * @param string $path - file path
+     *
+     * @return array
+     *
+     * @NoAdminRequired
+     * @PublicPage
+     */
+    public function reference($referenceData, $path = null) {
+        $this->logger->debug("reference: " . json_encode($referenceData) . " $path", ["app" => $this->appName]);
+
+        if (!$this->config->isUserAllowedToUse()) {
+            return ["error" => $this->trans->t("Not permitted")];
+        }
+
+        $user = $this->userSession->getUser();
+        if (empty($user)) {
+            return ["error" => $this->trans->t("Not permitted")];
+        }
+
+        $userId = $user->getUID();
+
+        $file = null;
+        $fileId = (integer)($referenceData["fileKey"] ?? 0);
+        if (!empty($fileId)
+            && $referenceData["instanceId"] === $this->config->GetSystemValue("instanceid", true)) {
+            list ($file, $error, $share) = $this->getFile($userId, $fileId);
+        }
+
+        $userFolder = $this->root->getUserFolder($userId);
+        if ($file === null
+            && $path !== null
+            && $userFolder->nodeExists($path)) {
+            $node = $userFolder->get($path);
+            if ($node instanceof File
+                && $node->isReadable()) {
+                $file = $node;
+            }
+        }
+
+        if ($file === null) {
+            $this->logger->error("Reference not found: $fileId $path", ["app" => $this->appName]);
+            return ["error" => $this->trans->t("File not found")];
+        }
+
+        $fileName = $file->getName();
+        $ext = strtolower(pathinfo($fileName, PATHINFO_EXTENSION));
+
+        $response = [
+            "fileType" => $ext,
+            "path" => $userFolder->getRelativePath($file->getPath()),
+            "referenceData" => [
+                "fileKey" => $file->getId(),
+                "instanceId" => $this->config->GetSystemValue("instanceid", true),
+            ],
+            "url" => $this->getUrl($file, $user),
+        ];
+
+        if (!empty($this->config->GetDocumentServerSecret())) {
+            $token = \Firebase\JWT\JWT::encode($response, $this->config->GetDocumentServerSecret(), "HS256");
+            $response["token"] = $token;
+        }
+
+        return $response;
+    }
+
     /**
      * Conversion file to Office Open XML format
      *
@@ -890,8 +959,11 @@ public function version($fileId, $version) {
             $fileUrl = $this->getUrl($file, $user, null, $version);
         }
         $key = DocumentService::GenerateRevisionId($key);
+        $fileName = $file->getName();
+        $ext = strtolower(pathinfo($fileName, PATHINFO_EXTENSION));
 
         $result = [
+            "fileType" => $ext,
             "url" => $fileUrl,
             "version" => $version,
             "key" => $key
@@ -911,13 +983,14 @@ public function version($fileId, $version) {
             $prevVersionUrl = $this->getUrl($file, $user, null, $version - 1);
 
             $result["previous"] = [
+                "fileType" => $ext,
                 "key" => $prevVersionKey,
                 "url" => $prevVersionUrl
             ];
         }
 
         if (!empty($this->config->GetDocumentServerSecret())) {
-            $token = \Firebase\JWT\JWT::encode($result, $this->config->GetDocumentServerSecret());
+            $token = \Firebase\JWT\JWT::encode($result, $this->config->GetDocumentServerSecret(), "HS256");
             $result["token"] = $token;
         }
 
@@ -1019,7 +1092,7 @@ public function url($filePath) {
         ];
 
         if (!empty($this->config->GetDocumentServerSecret())) {
-            $token = \Firebase\JWT\JWT::encode($result, $this->config->GetDocumentServerSecret());
+            $token = \Firebase\JWT\JWT::encode($result, $this->config->GetDocumentServerSecret(), "HS256");
             $result["token"] = $token;
         }
 
@@ -1293,7 +1366,7 @@ private function getUrl($file, $user = null, $shareToken = null, $version = 0, $
 
         $fileUrl = $this->urlGenerator->linkToRouteAbsolute($this->appName . ".callback.download", ["doc" => $hashUrl]);
 
-        if (!empty($this->config->GetStorageUrl())) {
+        if (!$this->config->UseDemo() && !empty($this->config->GetStorageUrl())) {
             $fileUrl = str_replace($this->urlGenerator->getAbsoluteURL("/"), $this->config->GetStorageUrl(), $fileUrl);
         }
 
diff --git a/controller/joblistcontroller.php b/controller/joblistcontroller.php
new file mode 100644
index 00000000..c2722692
--- /dev/null
+++ b/controller/joblistcontroller.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ *
+ * (c) Copyright Ascensio System SIA 2023
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+namespace OCA\Onlyoffice\Controller;
+
+use OC\AppFramework\Http;
+use OC\BackgroundJob\TimedJob;
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\DataDisplayResponse;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\Http\Response;
+use OCP\BackgroundJob\IJob;
+use OCP\BackgroundJob\IJobList;
+use OCP\ILogger;
+use OCP\IRequest;
+
+use OCA\Onlyoffice\Cron\EditorsCheck;
+use OCA\Onlyoffice\AppConfig;
+
+/**
+ * Class JobListController
+ *
+ * @package OCA\Onlyoffice\Controller
+ */
+class JobListController extends Controller {
+
+    /**
+     * Logger
+     * 
+     * @var ILogger
+     */
+    private $logger;
+
+    /**
+     * Job list
+     * 
+     * @var IJobList
+     */
+    private $jobList;
+
+    /**
+     * Application configuration
+     *
+     * @var AppConfig
+     */
+    private $config;
+
+    /**
+     * JobListController constructor.
+     *
+     * @param string $AppName - application name
+     * @param IRequest $request - request object
+     * @param ILogger $logger
+     * @param AppConfig $config - application configuration
+     * @param IJobList $jobList - job list
+     */
+    public function __construct($AppName, IRequest $request, ILogger $logger, AppConfig $config, IJobList $jobList) {
+        parent::__construct($AppName, $request);
+        $this->logger = $logger;
+        $this->config = $config;
+        $this->jobList = $jobList;
+    }
+
+    /**
+     * Add a job to list
+     * 
+     * @param IJob|string $job
+     */
+    private function addJob($job) {
+        if (!$this->jobList->has($job, null)) {
+            $this->jobList->add($job);
+            $this->logger->debug("Job '".$job."' added to JobList.", ["app" => $this->appName]);
+        }
+    }
+
+    /**
+     * Remove a job from list
+     * 
+     * @param IJob|string $job
+     */
+    private function removeJob($job) {
+        if ($this->jobList->has($job, null)) {
+            $this->jobList->remove($job);
+            $this->logger->debug("Job '".$job."' removed from JobList.", ["app" => $this->appName]);
+        }
+    }
+
+    /**
+     * Add or remove EditorsCheck job depending on the value of _editors_check_interval
+     * 
+     */
+    private function checkEditorsCheckJob() {
+        if ($this->config->GetEditorsCheckInterval() > 0) {
+            $this->addJob(EditorsCheck::class);
+        } else {
+            $this->removeJob(EditorsCheck::class);
+        }
+    }
+
+    /**
+     * Method for sequentially calling checks of all jobs
+     * 
+     */
+    public function checkAllJobs() {
+        $this->checkEditorsCheckJob();
+    }
+}
diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php
index 43b0de5a..5e112e51 100644
--- a/controller/settingscontroller.php
+++ b/controller/settingscontroller.php
@@ -110,6 +110,7 @@ public function index() {
             "storageUrl" => $this->config->GetStorageUrl(),
             "verifyPeerOff" => $this->config->GetVerifyPeerOff(),
             "secret" => $this->config->GetDocumentServerSecret(true),
+            "jwtHeader" => $this->config->JwtHeader(true),
             "demo" => $this->config->GetDemoData(),
             "currentServer" => $this->urlGenerator->getAbsoluteURL("/"),
             "formats" => $this->config->FormatsSetting(),
@@ -130,7 +131,8 @@ public function index() {
             "macros" => $this->config->GetCustomizationMacros(),
             "reviewDisplay" => $this->config->GetCustomizationReviewDisplay(),
             "theme" => $this->config->GetCustomizationTheme(),
-            "templates" => $this->GetGlobalTemplates()
+            "templates" => $this->GetGlobalTemplates(),
+            "linkToDocs" => $this->config->GetLinkToDocs()
         ];
         return new TemplateResponse($this->appName, "settings", $data, "blank");
     }
@@ -138,6 +140,7 @@ public function index() {
     /**
      * Save address settings
      *
+     * @param string $jwtHeader - jwt header
      * @param string $documentserver - document service address
      * @param string $documentserverInternal - document service address available from ownCloud
      * @param string $storageUrl - ownCloud address available from document server
@@ -152,6 +155,7 @@ public function SaveAddress($documentserver,
                                     $storageUrl,
                                     $verifyPeerOff,
                                     $secret,
+                                    $jwtHeader,
                                     $demo
                                     ) {
         $error = null;
@@ -163,6 +167,7 @@ public function SaveAddress($documentserver,
             $this->config->SetVerifyPeerOff($verifyPeerOff);
             $this->config->SetDocumentServerInternalUrl($documentserverInternal);
             $this->config->SetDocumentServerSecret($secret);
+            $this->config->SetJwtHeader($jwtHeader);
         }
         $this->config->SetStorageUrl($storageUrl);
 
@@ -186,6 +191,7 @@ public function SaveAddress($documentserver,
             "documentserverInternal" => $this->config->GetDocumentServerInternalUrl(true),
             "storageUrl" => $this->config->GetStorageUrl(),
             "secret" => $this->config->GetDocumentServerSecret(true),
+            "jwtHeader" => $this->config->JwtHeader(true),
             "error" => $error,
             "version" => $version,
             ];
diff --git a/controller/webassetcontroller.php b/controller/webassetcontroller.php
index 4232f128..200db7c4 100644
--- a/controller/webassetcontroller.php
+++ b/controller/webassetcontroller.php
@@ -19,7 +19,6 @@
 
 namespace OCA\Onlyoffice\Controller;
 
-use GuzzleHttp\Mimetypes;
 use OC\AppFramework\Http;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\DataDisplayResponse;
@@ -65,7 +64,7 @@ public function get(): Response {
         $filePath = \realpath( $basePath . '/js/web/onlyoffice.js');
         try {
             return new DataDisplayResponse(\file_get_contents($filePath), Http::STATUS_OK, [
-                'Content-Type' => $this->getMimeType($filePath),
+                'Content-Type' => "text/javascript",
                 'Content-Length' => \filesize($filePath),
                 'Cache-Control' => 'max-age=0, no-cache, no-store, must-revalidate',
                 'Pragma' => 'no-cache',
@@ -77,9 +76,4 @@ public function get(): Response {
             return new DataResponse(["message" => $e->getMessage()], Http::STATUS_NOT_FOUND);
         }
     }
-
-    private function getMimeType(string $filename): string {
-        $mimeTypes = Mimetypes::getInstance();
-        return $mimeTypes->fromFilename($filename);
-    }
 }
diff --git a/css/settings.css b/css/settings.css
index bf5c3d3d..0899c3ba 100644
--- a/css/settings.css
+++ b/css/settings.css
@@ -70,3 +70,94 @@
 .onlyoffice-option-desc {
     margin-left: 20px;
 }
+#onlyofficeDocsCloudBannerWrapper {
+    max-width: 596px;
+    min-height: 108px;
+    text-align: center;
+    background-image: url("../img/get-editors-background.svg");
+    background-repeat: no-repeat;
+    background-color: #FFFFFF;
+    border: 1px solid #EFEFEF;
+    border-radius: 3px;
+    display: flex;
+    flex-direction: row;
+    margin-top: 10px;
+}
+
+#onlyofficeDocsCloudBannerPicWrapper {
+    height: 100%;
+    width: 20%;
+    padding: 10px 0 0 20px;
+}
+
+#onlyofficeDocsCloudBannerPic {
+    content: url("../img/get-editors-pic.svg");
+}
+
+#onlyofficeDocsCloudBannerContent {
+    height: 100%;
+    width: 80%;
+    color: #000000;
+    display: flex;
+    flex-direction: row;
+    margin: auto;
+}
+
+#onlyofficeDocsCloudBannerContentText {
+    width: 60%;
+    height: 100%;
+    color: #000;
+    font-size: 14px;
+    text-align: justify;
+    padding-left: 15px;
+}
+
+#onlyofficeDocsCloudBannerContentText h2 {
+    margin: 0;
+    color: #000000;
+}
+
+#onlyofficeDocsCloudBannerContentButtonWrapper {
+    width: 40%;
+    height: 100%;
+    margin: auto;
+}
+
+#onlyofficeDocsCloudBannerContentButton {
+    background-color: #EDEDED;
+    color: #000;
+    border: 1px solid #DBDBDB;
+}
+
+@media (max-width: 580px) {
+    #onlyofficeDocsCloudBannerPicWrapper {
+        padding: 20px 0 0 5px;
+        width: 30%;
+    }
+    #onlyofficeDocsCloudBannerContent {
+        flex-direction: column;
+        width: 70%;
+    }
+    #onlyofficeDocsCloudBannerContentText {
+        width: 100%;
+        padding-right: 5px;
+    }
+    #onlyofficeDocsCloudBannerContentButtonWrapper {
+        width: 100%;
+        padding: 15px 0 15px 15px;
+        text-align: left;
+    }
+}
+
+@media (max-width: 335px) {
+    #onlyofficeDocsCloudBannerWrapper {
+        flex-direction: column;
+    }
+    #onlyofficeDocsCloudBannerPicWrapper {
+        width: 100%;
+        padding: unset;
+    }
+    #onlyofficeDocsCloudBannerContent {
+        width: 100%;
+    }
+}
\ No newline at end of file
diff --git a/img/get-editors-background.svg b/img/get-editors-background.svg
new file mode 100644
index 00000000..ff6f91dc
--- /dev/null
+++ b/img/get-editors-background.svg
@@ -0,0 +1,5 @@
+<svg width="330" height="109" viewBox="0 0 330 109" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.2" fill-rule="evenodd" clip-rule="evenodd" d="M200.312 35.0118L319.469 -1.55981C329.809 -4.79061 330.913 -12.1101 321.937 -17.9211L217.12 -89.8431C206.428 -97.8525 196.26 -100.837 180.603 -95.0369L61.6195 -58.631C51.2792 -55.4002 50.1752 -48.0807 59.1516 -42.2697L159.229 29.7745C169.982 38.1849 180.758 40.3099 200.312 35.0118Z" fill="#D9F4FF"/>
+<path opacity="0.25" fill-rule="evenodd" clip-rule="evenodd" d="M61.6559 71.8593L-61.7485 49.1471C-72.29 47.101 -74.1577 40.0036 -65.9233 33.2823L29.7952 -49.2144C37.9197 -56.3533 52.9337 -60.4496 63.0694 -58.2928L186.474 -35.5806C197.015 -33.5345 198.883 -26.4371 190.649 -19.7158L94.9301 62.7809C85.4843 71.1519 71.6817 73.5986 61.6559 71.8593Z" fill="#D9F4FF"/>
+<path opacity="0.3" fill-rule="evenodd" clip-rule="evenodd" d="M90.9531 17.0096L101.347 -110.242C102.134 -121.139 95.8849 -124.813 87.3776 -118.454L-15.6547 -45.6628C-24.5296 -39.5197 -32.3014 -25.813 -32.8787 -15.2859L-43.2726 111.965C-44.06 122.863 -37.8106 126.537 -29.3033 120.178L73.7291 47.3864C84.1147 40.2626 90.0081 27.3206 90.9531 17.0096Z" fill="#D9F4FF"/>
+</svg>
\ No newline at end of file
diff --git a/img/get-editors-pic.svg b/img/get-editors-pic.svg
new file mode 100644
index 00000000..939d3d29
--- /dev/null
+++ b/img/get-editors-pic.svg
@@ -0,0 +1,57 @@
+<svg width="82" height="79" viewBox="0 0 82 79" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M63.6176 66H14.3824C13.0324 66 12 64.96 12 63.6V28.4C12 27.04 13.0324 26 14.3824 26H63.6176C64.9676 26 66 27.04 66 28.4V63.6C66 64.96 64.9676 66 63.6176 66Z" fill="#EFEFEF"/>
+<path d="M12.0001 28.1805C12.0001 27.2943 13.2872 26 14.1706 26H62.8293C63.6321 26 64.7685 26 64.9692 27.5009C65.0058 27.7746 65.224 28 65.5001 28C65.7762 28 66.0046 27.7747 65.9628 27.5017C65.7308 25.9888 64.4432 25 62.8293 25H14.1706C12.3857 25 11 26.39 11 28.1805V42.9999C11 43.5522 11.4477 44 12.0001 44V28.1805Z" fill="#444444"/>
+<path d="M63.6176 66H14.3824C13.0324 66 12 64.9721 12 63.6279V32H66V63.6279C66 64.9721 64.9676 66 63.6176 66Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11 32.8305C11 32.3718 11.3654 32 11.8162 32H50.5C50.7761 32 51 32.2239 51 32.5C51 32.7761 50.7761 33 50.5 33H12V45.5355C12 45.8116 11.7761 46.0355 11.5 46.0355C11.2239 46.0355 11 45.8116 11 45.5355V32.8305ZM65.5 58C65.2239 58 65 58.2239 65 58.5V59.5C65 59.7761 65.2239 60 65.5 60C65.7761 60 66 59.7761 66 59.5V58.5C66 58.2239 65.7761 58 65.5 58ZM38 67.5C38 67.2239 38.2239 67 38.5 67H40.5C40.7761 67 41 67.2239 41 67.5C41 67.7761 40.7761 68 40.5 68H38.5C38.2239 68 38 67.7761 38 67.5Z" fill="#444444"/>
+<path d="M15 30C15.5523 30 16 29.5523 16 29C16 28.4477 15.5523 28 15 28C14.4477 28 14 28.4477 14 29C14 29.5523 14.4477 30 15 30Z" fill="#444444"/>
+<path d="M19 30C19.5523 30 20 29.5523 20 29C20 28.4477 19.5523 28 19 28C18.4477 28 18 28.4477 18 29C18 29.5523 18.4477 30 19 30Z" fill="#444444"/>
+<path d="M23 30C23.5523 30 24 29.5523 24 29C24 28.4477 23.5523 28 23 28C22.4477 28 22 28.4477 22 29C22 29.5523 22.4477 30 23 30Z" fill="#444444"/>
+<rect x="15" y="35" width="30" height="1" rx="0.5" fill="#EFEFEF"/>
+<rect x="17" y="38" width="30" height="1" rx="0.5" fill="#EFEFEF"/>
+<rect x="15" y="41" width="30" height="1" rx="0.5" fill="#EFEFEF"/>
+<path d="M30 25L38 17L46 25" stroke="#444444" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M40.1465 13.4279V10.8409H38.9998H37.853V14.0747C37.853 14.0747 39.9936 14.6406 39.9936 16.7426C39.9936 18.2787 38.8469 19.4913 37.3943 19.4913C36.0946 19.4913 35.0242 18.5212 34.8713 17.2277C34.8713 17.3894 34.7949 17.6319 34.7949 17.7936C34.7949 20.219 36.7062 22.1593 38.9998 22.1593C41.2933 22.1593 43.2047 20.219 43.2047 17.7936C43.2047 15.6108 41.9814 13.913 40.1465 13.4279Z" fill="#EFEFEF"/>
+<path d="M40.4419 12.8149C40.4419 13.0173 40.5639 13.1998 40.751 13.277C42.4094 13.9619 43.5 15.6656 43.5 17.7935C43.5 20.441 41.4237 22.5 39 22.5C36.5763 22.5 34.5 20.441 34.5 17.7935C34.5 17.7252 34.5079 17.6581 34.5162 17.6023C34.5243 17.5481 34.5348 17.4921 34.5438 17.4445L34.5449 17.4386C34.5547 17.387 34.5629 17.3437 34.5687 17.3042C34.5707 17.2911 34.5721 17.2802 34.5732 17.2714C34.5751 17.2547 34.5762 17.238 34.5765 17.2212C34.5797 17.0199 34.7234 16.896 34.855 16.8874C34.9851 16.8788 35.1403 16.9815 35.164 17.182C35.2929 18.2725 36.2091 19.1505 37.3945 19.1505C38.7101 19.1505 39.6988 18.0637 39.6988 16.7425C39.6988 15.8497 39.252 15.2751 38.7628 14.9055C38.5189 14.7213 38.2726 14.5954 38.0861 14.5156C37.9933 14.4759 37.9166 14.4481 37.864 14.4305C37.8377 14.4217 37.8176 14.4155 37.8046 14.4117L37.8019 14.4109L37.7956 14.409L37.7866 14.4065C37.6689 14.3746 37.5581 14.2499 37.5581 14.0746V10.8408C37.5581 10.6259 37.7162 10.5 37.8532 10.5H40.1468C40.2838 10.5 40.4419 10.6259 40.4419 10.8408V12.8149Z" fill="#AAAAAA" stroke="#444444" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M80 30H55V55H80V30Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M54.5 32C54.2239 32 54 31.7761 54 31.5V30C54 29.4477 54.4477 29 55 29H56.5C56.7761 29 57 29.2239 57 29.5C57 29.7761 56.7761 30 56.5 30H55V31.5C55 31.7761 54.7761 32 54.5 32ZM65.25 29.5C65.25 29.2239 65.0261 29 64.75 29H61.25C60.9739 29 60.75 29.2239 60.75 29.5C60.75 29.7761 60.9739 30 61.25 30H64.75C65.0261 30 65.25 29.7761 65.25 29.5ZM70.25 29C69.9739 29 69.75 29.2239 69.75 29.5C69.75 29.7761 69.9739 30 70.25 30H73.75C74.0261 30 74.25 29.7761 74.25 29.5C74.25 29.2239 74.0261 29 73.75 29H70.25ZM78.5 29C78.224 29 78 29.2239 78 29.5C78 29.7761 78.224 30 78.5 30H80V31.5C80 31.7761 80.224 32 80.5 32C80.776 32 81 31.7761 81 31.5V30C81 29.4477 80.552 29 80 29H79.5H78.5ZM81 36.25C81 35.9739 80.776 35.75 80.5 35.75C80.224 35.75 80 35.9739 80 36.25V39.75C80 40.0261 80.224 40.25 80.5 40.25C80.776 40.25 81 40.0261 81 39.75V36.25ZM81 45.25C81 44.9739 80.776 44.75 80.5 44.75C80.224 44.75 80 44.9739 80 45.25V48.75C80 49.0261 80.224 49.25 80.5 49.25C80.776 49.25 81 49.0261 81 48.75V45.25ZM81 53.5C81 53.2239 80.776 53 80.5 53C80.224 53 80 53.2239 80 53.5V55H78.5C78.224 55 78 55.2239 78 55.5C78 55.7761 78.224 56 78.5 56H80C80.552 56 81 55.5523 81 55V53.5ZM73.75 56C74.0261 56 74.25 55.7761 74.25 55.5C74.25 55.2239 74.0261 55 73.75 55H70.25C69.9739 55 69.75 55.2239 69.75 55.5C69.75 55.7761 69.9739 56 70.25 56H73.75ZM64.75 56C65.0261 56 65.25 55.7761 65.25 55.5C65.25 55.2239 65.0261 55 64.75 55H61.25C60.9739 55 60.75 55.2239 60.75 55.5C60.75 55.7761 60.9739 56 61.25 56H64.75ZM56.5 56C56.7761 56 57 55.7761 57 55.5C57 55.2239 56.7761 55 56.5 55H55V53.5C55 53.2239 54.7761 53 54.5 53C54.2239 53 54 53.2239 54 53.5V55C54 55.5523 54.4477 56 55 56H56.5ZM54 48.75C54 49.0261 54.2239 49.25 54.5 49.25C54.7761 49.25 55 49.0261 55 48.75V45.25C55 44.9739 54.7761 44.75 54.5 44.75C54.2239 44.75 54 44.9739 54 45.25V48.75ZM54 39.75C54 40.0261 54.2239 40.25 54.5 40.25C54.7761 40.25 55 40.0261 55 39.75V36.25C55 35.9739 54.7761 35.75 54.5 35.75C54.2239 35.75 54 35.9739 54 36.25V39.75Z" fill="#808080"/>
+<path d="M54 30C54.5523 30 55 29.5523 55 29C55 28.4477 54.5523 28 54 28C53.4477 28 53 28.4477 53 29C53 29.5523 53.4477 30 54 30Z" fill="#808080"/>
+<path d="M81 30C81.552 30 82 29.5523 82 29C82 28.4477 81.552 28 81 28C80.448 28 80 28.4477 80 29C80 29.5523 80.448 30 81 30Z" fill="#808080"/>
+<path d="M54 57C54.5523 57 55 56.5523 55 56C55 55.4477 54.5523 55 54 55C53.4477 55 53 55.4477 53 56C53 56.5523 53.4477 57 54 57Z" fill="#808080"/>
+<path d="M81 57C81.552 57 82 56.5523 82 56C82 55.4477 81.552 55 81 55C80.448 55 80 55.4477 80 56C80 56.5523 80.448 57 81 57Z" fill="#808080"/>
+<path d="M75.4059 52H60.5942C59.1716 52 58 50.8917 58 49.5458V35.4542C58 34.1083 59.1716 33 60.5942 33H75.4059C77.5 33 78 34.1083 78 35.4542V49.4667C78 51 77 52 75.4059 52Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M60.5058 33C59.5526 33 58 34.4272 58 35.3336V49.6664C58 51 59 52 60.5058 52H75.4942C77 52 78 51 78 49.5V35.3336C78 34 77 33 75.4942 33H60.5058ZM57 35.3336C57 33.5022 58.5799 32 60.5058 32H75.4942C77.42 32 79 33.5022 79 35.3336V49.5859C79 51.4803 77.438 53 75.4942 53H60.5058C58.5799 53 57 51.4978 57 49.6664V35.3336Z" fill="#444444"/>
+<path d="M63 40C63 39.4477 62.5523 39 62 39C61.4477 39 61 39.4477 61 40V48C61 48.5523 61.4477 49 62 49C62.5523 49 63 48.5523 63 48V40Z" fill="#FF6F3D"/>
+<path d="M67 44C67 43.4477 66.5523 43 66 43C65.4477 43 65 43.4477 65 44V48C65 48.5523 65.4477 49 66 49C66.5523 49 67 48.5523 67 48V44Z" fill="#FF6F3D"/>
+<path d="M71 42C71 41.4477 70.5523 41 70 41C69.4477 41 69 41.4477 69 42V48C69 48.5523 69.4477 49 70 49C70.5523 49 71 48.5523 71 48V42Z" fill="#FF6F3D"/>
+<path d="M75 37C75 36.4477 74.5523 36 74 36C73.4477 36 73 36.4477 73 37V48C73 48.5523 73.4477 49 74 49C74.5523 49 75 48.5523 75 48V37Z" fill="#FF6F3D"/>
+<path d="M80 61H43V77H80V61Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M42.4875 63C42.2183 63 42 62.7817 42 62.5125V61C42 60.4477 42.4477 60 43 60H44.425C44.7011 60 44.925 60.2239 44.925 60.5C44.925 60.7761 44.7011 61 44.425 61H42.975V62.5125C42.975 62.7817 42.7567 63 42.4875 63ZM54.1875 60.5C54.1875 60.2239 53.9636 60 53.6875 60H49.8125C49.5364 60 49.3125 60.2239 49.3125 60.5C49.3125 60.7761 49.5364 61 49.8125 61H53.6875C53.9636 61 54.1875 60.7761 54.1875 60.5ZM59.5625 60C59.2864 60 59.0625 60.2239 59.0625 60.5C59.0625 60.7761 59.2864 61 59.5625 61H63.4375C63.7136 61 63.9375 60.7761 63.9375 60.5C63.9375 60.2239 63.7136 60 63.4375 60H59.5625ZM69.3125 60C69.0364 60 68.8125 60.2239 68.8125 60.5C68.8125 60.7761 69.0364 61 69.3125 61H73.1875C73.4636 61 73.6875 60.7761 73.6875 60.5C73.6875 60.2239 73.4636 60 73.1875 60H69.3125ZM78.575 60C78.299 60 78.075 60.2239 78.075 60.5C78.075 60.7761 78.299 61 78.575 61H80.025V62.5125C80.025 62.7817 80.243 63 80.512 63C80.782 63 81 62.7817 81 62.5125V61C81 60.4477 80.552 60 80 60H78.575ZM81 67.2375C81 66.9683 80.782 66.75 80.512 66.75C80.243 66.75 80.025 66.9683 80.025 67.2375V70.7625C80.025 71.0317 80.243 71.25 80.512 71.25C80.782 71.25 81 71.0317 81 70.7625V67.2375ZM81 75.488C81 75.218 80.782 75 80.512 75C80.243 75 80.025 75.218 80.025 75.488V77H78.575C78.299 77 78.075 77.224 78.075 77.5C78.075 77.776 78.299 78 78.575 78H80C80.552 78 81 77.552 81 77V75.488ZM73.1875 78C73.4636 78 73.6875 77.776 73.6875 77.5C73.6875 77.224 73.4636 77 73.1875 77H69.3125C69.0364 77 68.8125 77.224 68.8125 77.5C68.8125 77.776 69.0364 78 69.3125 78H73.1875ZM63.4375 78C63.7136 78 63.9375 77.776 63.9375 77.5C63.9375 77.224 63.7136 77 63.4375 77H59.5625C59.2864 77 59.0625 77.224 59.0625 77.5C59.0625 77.776 59.2864 78 59.5625 78H63.4375ZM53.6875 78C53.9636 78 54.1875 77.776 54.1875 77.5C54.1875 77.224 53.9636 77 53.6875 77H49.8125C49.5364 77 49.3125 77.224 49.3125 77.5C49.3125 77.776 49.5364 78 49.8125 78H53.6875ZM44.425 78C44.7011 78 44.925 77.776 44.925 77.5C44.925 77.224 44.7011 77 44.425 77H42.975V75.488C42.975 75.218 42.7567 75 42.4875 75C42.2183 75 42 75.218 42 75.488V77C42 77.552 42.4477 78 43 78H44.425ZM42 70.7625C42 71.0317 42.2183 71.25 42.4875 71.25C42.7567 71.25 42.975 71.0317 42.975 70.7625V67.2375C42.975 66.9683 42.7567 66.75 42.4875 66.75C42.2183 66.75 42 66.9683 42 67.2375V70.7625Z" fill="#808080"/>
+<path d="M42 61C42.5523 61 43 60.5523 43 60C43 59.4477 42.5523 59 42 59C41.4477 59 41 59.4477 41 60C41 60.5523 41.4477 61 42 61Z" fill="#808080"/>
+<path d="M81 61C81.552 61 82 60.5523 82 60C82 59.4477 81.552 59 81 59C80.448 59 80 59.4477 80 60C80 60.5523 80.448 61 81 61Z" fill="#808080"/>
+<path d="M42 79C42.5523 79 43 78.552 43 78C43 77.448 42.5523 77 42 77C41.4477 77 41 77.448 41 78C41 78.552 41.4477 79 42 79Z" fill="#808080"/>
+<path d="M81 79C81.552 79 82 78.552 82 78C82 77.448 81.552 77 81 77C80.448 77 80 77.448 80 78C80 78.552 80.448 79 81 79Z" fill="#808080"/>
+<path d="M52 64H47C46.4477 64 46 64.4477 46 65C46 65.5523 46.4477 66 47 66H52C52.5523 66 53 65.5523 53 65C53 64.4477 52.5523 64 52 64Z" fill="#BDECFF"/>
+<path d="M52 68H47C46.4477 68 46 68.4477 46 69C46 69.5523 46.4477 70 47 70H52C52.5523 70 53 69.5523 53 69C53 68.4477 52.5523 68 52 68Z" fill="#BDECFF"/>
+<path d="M52 72H47C46.4477 72 46 72.4477 46 73C46 73.5523 46.4477 74 47 74H52C52.5523 74 53 73.5523 53 73C53 72.4477 52.5523 72 52 72Z" fill="#BDECFF"/>
+<path d="M60 64H55C54.4477 64 54 64.4477 54 65C54 65.5523 54.4477 66 55 66H60C60.5523 66 61 65.5523 61 65C61 64.4477 60.5523 64 60 64Z" fill="#BDECFF"/>
+<path d="M60 68H55C54.4477 68 54 68.4477 54 69C54 69.5523 54.4477 70 55 70H60C60.5523 70 61 69.5523 61 69C61 68.4477 60.5523 68 60 68Z" fill="#BDECFF"/>
+<path d="M60 72H55C54.4477 72 54 72.4477 54 73C54 73.5523 54.4477 74 55 74H60C60.5523 74 61 73.5523 61 73C61 72.4477 60.5523 72 60 72Z" fill="#BDECFF"/>
+<path d="M68 64H63C62.4477 64 62 64.4477 62 65C62 65.5523 62.4477 66 63 66H68C68.5523 66 69 65.5523 69 65C69 64.4477 68.5523 64 68 64Z" fill="#BDECFF"/>
+<path d="M68 68H63C62.4477 68 62 68.4477 62 69C62 69.5523 62.4477 70 63 70H68C68.5523 70 69 69.5523 69 69C69 68.4477 68.5523 68 68 68Z" fill="#BDECFF"/>
+<path d="M68 72H63C62.4477 72 62 72.4477 62 73C62 73.5523 62.4477 74 63 74H68C68.5523 74 69 73.5523 69 73C69 72.4477 68.5523 72 68 72Z" fill="#BDECFF"/>
+<path d="M76 64H71C70.4477 64 70 64.4477 70 65C70 65.5523 70.4477 66 71 66H76C76.5523 66 77 65.5523 77 65C77 64.4477 76.5523 64 76 64Z" fill="#BDECFF"/>
+<path d="M76 68H71C70.4477 68 70 68.4477 70 69C70 69.5523 70.4477 70 71 70H76C76.5523 70 77 69.5523 77 69C77 68.4477 76.5523 68 76 68Z" fill="#BDECFF"/>
+<path d="M76 72H71C70.4477 72 70 72.4477 70 73C70 73.5523 70.4477 74 71 74H76C76.5523 74 77 73.5523 77 73C77 72.4477 76.5523 72 76 72Z" fill="#BDECFF"/>
+<path d="M36 48H2V72H36V48Z" fill="white"/>
+<path d="M29.6364 52H8.3636C7.0242 52 6 52.9905 6 54.2857V65.7143C6 67.0095 7.0242 68 8.3636 68H29.6364C30.9758 68 32 67.0095 32 65.7143V54.2857C32 52.9905 30.9758 52 29.6364 52Z" fill="white"/>
+<path d="M20.5758 64.4483L14.2727 57L6 66.5172C6 67.9241 7.0242 69 8.3636 69H29.6364C30.9758 69 32 67.9241 32 66.5172L25.303 59.4828L20.5758 64.4483Z" fill="#FF6F3D"/>
+<path d="M21 58C22.1046 58 23 57.1046 23 56C23 54.8954 22.1046 54 21 54C19.8954 54 19 54.8954 19 56C19 57.1046 19.8954 58 21 58Z" fill="#FF6F3D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 54.1508C5 52.377 6.4093 51 8.2246 51H29.7754C31.5907 51 33 52.377 33 54.1508V65.8492C33 67.623 31.5907 69 29.7754 69H8.2246C6.4093 69 5 67.623 5 65.8492V54.1508ZM8.2246 52C7 52 6 53 6 54.1508V65.8492C6 67 7 68 8.2246 68H29.7754C31 68 32 67 32 65.8492V54.1508C32 53 31 52 29.7754 52H8.2246Z" fill="#444444"/>
+<path d="M1 48C1.5523 48 2 47.5523 2 47C2 46.4477 1.5523 46 1 46C0.4477 46 0 46.4477 0 47C0 47.5523 0.4477 48 1 48Z" fill="#808080"/>
+<path d="M37 48C37.5523 48 38 47.5523 38 47C38 46.4477 37.5523 46 37 46C36.4477 46 36 46.4477 36 47C36 47.5523 36.4477 48 37 48Z" fill="#808080"/>
+<path d="M1 74C1.5523 74 2 73.5523 2 73C2 72.4477 1.5523 72 1 72C0.4477 72 0 72.4477 0 73C0 73.5523 0.4477 74 1 74Z" fill="#808080"/>
+<path d="M37 74C37.5523 74 38 73.5523 38 73C38 72.4477 37.5523 72 37 72C36.4477 72 36 72.4477 36 73C36 73.5523 36.4477 74 37 74Z" fill="#808080"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.5294 50.12C1.237 50.12 1 49.883 1 49.5906V48C1 47.4477 1.4477 47 2 47H3.48C3.7672 47 4 47.2328 4 47.52C4 47.8072 3.7672 48.04 3.48 48.04H2.0588V49.5906C2.0588 49.883 1.8218 50.12 1.5294 50.12ZM10.52 47C10.2328 47 10 47.2328 10 47.52C10 47.8072 10.2328 48.04 10.52 48.04H15.48C15.7672 48.04 16 47.8072 16 47.52C16 47.2328 15.7672 47 15.48 47H10.52ZM22.52 47C22.2328 47 22 47.2328 22 47.52C22 47.8072 22.2328 48.04 22.52 48.04H27.48C27.7672 48.04 28 47.8072 28 47.52C28 47.2328 27.7672 47 27.48 47H22.52ZM34.52 47C34.2328 47 34 47.2328 34 47.52C34 47.8072 34.2328 48.04 34.52 48.04H35.9412V49.5906C35.9412 49.883 36.1782 50.12 36.4706 50.12C36.763 50.12 37 49.883 37 49.5906V48C37 47.4477 36.5523 47 36 47H34.52ZM36.4706 57.8333C36.763 57.8333 37 57.5963 37 57.3039V54.0294C37 53.737 36.763 53.5 36.4706 53.5C36.1782 53.5 35.9412 53.737 35.9412 54.0294V57.3039C35.9412 57.5963 36.1782 57.8333 36.4706 57.8333ZM37 62.6961C37 62.4037 36.763 62.1667 36.4706 62.1667C36.1782 62.1667 35.9412 62.4037 35.9412 62.6961V65.9706C35.9412 66.263 36.1782 66.5 36.4706 66.5C36.763 66.5 37 66.263 37 65.9706V62.6961ZM37 70.4094C37 70.117 36.763 69.88 36.4706 69.88C36.1782 69.88 35.9412 70.117 35.9412 70.4094V71.96H34.52C34.2328 71.96 34 72.1928 34 72.48C34 72.7672 34.2328 73 34.52 73H36C36.5523 73 37 72.5523 37 72V70.4094ZM27.48 73C27.7672 73 28 72.7672 28 72.48C28 72.1928 27.7672 71.96 27.48 71.96H22.52C22.2328 71.96 22 72.1928 22 72.48C22 72.7672 22.2328 73 22.52 73H27.48ZM15.48 73C15.7672 73 16 72.7672 16 72.48C16 72.1928 15.7672 71.96 15.48 71.96H10.52C10.2328 71.96 10 72.1928 10 72.48C10 72.7672 10.2328 73 10.52 73H15.48ZM3.48 73C3.7672 73 4 72.7672 4 72.48C4 72.1928 3.7672 71.96 3.48 71.96H2.0588V70.4094C2.0588 70.117 1.8218 69.88 1.5294 69.88C1.237 69.88 1 70.117 1 70.4094V72C1 72.5523 1.4477 73 2 73H3.48ZM1 65.9706C1 66.263 1.237 66.5 1.5294 66.5C1.8218 66.5 2.0588 66.263 2.0588 65.9706V62.6961C2.0588 62.4037 1.8218 62.1667 1.5294 62.1667C1.237 62.1667 1 62.4037 1 62.6961V65.9706ZM1 57.3039C1 57.5963 1.237 57.8333 1.5294 57.8333C1.8218 57.8333 2.0588 57.5963 2.0588 57.3039V54.0294C2.0588 53.737 1.8218 53.5 1.5294 53.5C1.237 53.5 1 53.737 1 54.0294V57.3039Z" fill="#808080"/>
+<path d="M42 7.2087C42 7.4757 41.9375 7.7387 41.818 7.9747L40.7255 10.1317C40.4549 10.666 39.9248 11 39.3475 11H38.6525C38.0752 11 37.5451 10.666 37.2745 10.1317L36.182 7.9747C36.0625 7.7387 36 7.4757 36 7.2087V1.6343C36 0.7317 36.6984 0 37.56 0H40.44C41.3016 0 42 0.7317 42 1.6343V7.2087Z" fill="#EFEFEF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M39.3475 10.1317L41 7.2087V1H37V7.2087L38.6525 10.1317H39.3475ZM41.818 7.9747C41.9375 7.7387 42 7.4757 42 7.2087V1.6343C42 0.7317 41.3016 0 40.44 0H37.56C36.6984 0 36 0.7317 36 1.6343V7.2087C36 7.4757 36.0625 7.7387 36.182 7.9747L37.2745 10.1317C37.5451 10.666 38.0752 11 38.6525 11H39.3475C39.9248 11 40.4549 10.666 40.7255 10.1317L41.818 7.9747Z" fill="#444444"/>
+</svg>
\ No newline at end of file
diff --git a/js/editor.js b/js/editor.js
index 49975165..a925aafb 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -35,9 +35,12 @@
         OCA.Onlyoffice.template = $("#iframeEditor").data("template");
         OCA.Onlyoffice.inframe = !!$("#iframeEditor").data("inframe");
         OCA.Onlyoffice.anchor = $("#iframeEditor").attr("data-anchor");
+        OCA.Onlyoffice.currentWindow = window;
 
         if (OCA.Onlyoffice.inframe) {
             OCA.Onlyoffice.faviconBase = $('link[rel="icon"]').attr("href");
+            OCA.Onlyoffice.currentWindow = window.parent;
+            OCA.Onlyoffice.titleBase = OCA.Onlyoffice.currentWindow.document.title;
         }
 
         if (!OCA.Onlyoffice.fileId && !OCA.Onlyoffice.shareToken) {
@@ -111,7 +114,7 @@
 
                         if (docIsChanged !== event.data) {
                             var titleChange = function () {
-                                window.document.title = config.document.title + (event.data ? " *" : "") + " - " + oc_defaults.title;
+                                OCA.Onlyoffice.currentWindow.document.title = config.document.title + (event.data ? " *" : "") + " - " + oc_defaults.title;
                                 docIsChanged = event.data;
                             };
 
@@ -144,10 +147,14 @@
                         config.events.onRequestInsertImage = OCA.Onlyoffice.onRequestInsertImage;
                         config.events.onRequestMailMergeRecipients = OCA.Onlyoffice.onRequestMailMergeRecipients;
                         config.events.onRequestCompareFile = OCA.Onlyoffice.onRequestCompareFile;
-                        config.events.onRequestUsers = OCA.Onlyoffice.onRequestUsers;
                         config.events.onRequestSendNotify = OCA.Onlyoffice.onRequestSendNotify;
+                        config.events.onRequestReferenceData = OCA.Onlyoffice.onRequestReferenceData;
                         config.events.onMetaChange = OCA.Onlyoffice.onMetaChange;
 
+                        if (OC.currentUser) {
+                            config.events.onRequestUsers = OCA.Onlyoffice.onRequestUsers;
+                        }
+
                         if (!OCA.Onlyoffice.filePath) {
                             OCA.Onlyoffice.filePath = config._file_path;
                         }
@@ -205,7 +212,7 @@
     };
 
     OCA.Onlyoffice.onRequestHistoryData = function (event) {
-        var version = event.data; 
+        var version = event.data;
 
         $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/version?fileId={fileId}&version={version}",
             {
@@ -476,7 +483,7 @@
     };
 
     OCA.Onlyoffice.onRequestUsers = function (event) {
-        $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/users?fileId={fileId}", 
+        $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/users?fileId={fileId}",
         {
             fileId: OCA.Onlyoffice.fileId || 0
         }),
@@ -487,6 +494,25 @@
         });
     };
 
+    OCA.Onlyoffice.onRequestReferenceData = function (event) {
+        let referenceData = event.data.referenceData;
+        let path = event.data.path;
+
+        $.post(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/reference"),
+            {
+                referenceData: referenceData,
+                path: path
+            },
+            function onSuccess(response) {
+                if (response.error) {
+                    OCA.Onlyoffice.showMessage(response.error, "error");
+                    return;
+                }
+
+                OCA.Onlyoffice.docEditor.setReferenceData(response);
+            });
+    };
+
     OCA.Onlyoffice.onRequestSendNotify = function (event) {
         var actionLink = event.data.actionLink;
         var comment = event.data.message;
diff --git a/js/listener.js b/js/listener.js
index 3819ccf1..03069aa7 100644
--- a/js/listener.js
+++ b/js/listener.js
@@ -81,9 +81,11 @@
     }
 
     window.addEventListener("message", function (event) {
-        if ($("#onlyofficeFrame")[0].contentWindow !== event.source
-            || !event.data["method"]) {
-            return;
+        if ($("#onlyofficeFrame")[0]) {
+            if ($("#onlyofficeFrame")[0].contentWindow !== event.source
+                || !event.data["method"]) {
+                return;
+            }
         }
         switch (event.data.method) {
             case "editorRequestClose":
@@ -133,6 +135,7 @@
         if ($(event.target).length && $("#onlyofficeFrame").length
             && ($(event.target)[0].id === "viewer" || $(event.target)[0].id === $("#onlyofficeFrame")[0].id)) {
             OCA.Onlyoffice.changeFavicon($("#onlyofficeFrame")[0].contentWindow.OCA.Onlyoffice.faviconBase);
+            window.document.title = $("#onlyofficeFrame")[0].contentWindow.OCA.Onlyoffice.titleBase;
         }
     });
 
diff --git a/js/main.js b/js/main.js
index 3872c1aa..d26ae1a2 100644
--- a/js/main.js
+++ b/js/main.js
@@ -173,7 +173,10 @@
 
     OCA.Onlyoffice.FileClick = function (fileName, context) {
         var fileInfoModel = context.fileInfoModel || context.fileList.getModelForFile(fileName);
-        OCA.Onlyoffice.OpenEditor(fileInfoModel.id, context.dir, fileName);
+        var fileId = context.$file[0].dataset.id || fileInfoModel.id;
+        var winEditor = !fileInfoModel && !OCA.Onlyoffice.setting.sameTab ? document : null;
+
+        OCA.Onlyoffice.OpenEditor(fileId, context.dir, fileName, 0, winEditor);
 
         OCA.Onlyoffice.context = context;
         OCA.Onlyoffice.context.fileName = fileName;
@@ -184,7 +187,7 @@
         var fileList = context.fileList;
 
         var convertData = {
-            fileId: fileInfoModel.id
+            fileId: context.$file[0].dataset.id || fileInfoModel.id
         };
 
         if ($("#isPublic").val()) {
diff --git a/js/settings.js b/js/settings.js
index 985d24d9..c3a53c31 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -63,13 +63,14 @@
             var onlyofficeUrl = $("#onlyofficeUrl").val().trim();
 
             if (!onlyofficeUrl.length) {
-                $("#onlyofficeInternalUrl, #onlyofficeStorageUrl, #onlyofficeSecret").val("");
+                $("#onlyofficeInternalUrl, #onlyofficeStorageUrl, #onlyofficeSecret, #onlyofficeJwtHeader").val("");
             }
 
             var onlyofficeInternalUrl = ($("#onlyofficeInternalUrl:visible").val() || "").trim();
             var onlyofficeStorageUrl = ($("#onlyofficeStorageUrl:visible").val() || "").trim();
             var onlyofficeVerifyPeerOff = $("#onlyofficeVerifyPeerOff").prop("checked");
             var onlyofficeSecret = ($("#onlyofficeSecret:visible").val() || "").trim();
+            var jwtHeader = ($("#onlyofficeJwtHeader:visible").val() || "").trim();
             var demo = $("#onlyofficeDemo").prop("checked");
 
             $.ajax({
@@ -81,6 +82,7 @@
                     storageUrl: onlyofficeStorageUrl,
                     verifyPeerOff: onlyofficeVerifyPeerOff,
                     secret: onlyofficeSecret,
+                    jwtHeader: jwtHeader,
                     demo: demo
                 },
                 success: function onSuccess(response) {
@@ -90,8 +92,9 @@
                         $("#onlyofficeInternalUrl").val(response.documentserverInternal);
                         $("#onlyofficeStorageUrl").val(response.storageUrl);
                         $("#onlyofficeSecret").val(response.secret);
+                        $("#onlyofficeJwtHeader").val(response.jwtHeader);
 
-                        $(".section-onlyoffice-2").toggleClass("onlyoffice-hide", (!response.documentserver.length && !demo) || !!response.error.length);
+                        $(".section-onlyoffice-2").toggleClass("onlyoffice-hide", (response.documentserver == null && !demo) || !!response.error.length);
 
                         var message =
                             response.error
@@ -104,6 +107,8 @@
                             type: response.error ? "error" : null,
                             timeout: 3
                         });
+                    } else {
+                        $(".section-onlyoffice-2").addClass("onlyoffice-hide")
                     }
                 }
             });
diff --git a/l10n/de.js b/l10n/de.js
index 83d14e60..855ee303 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -116,6 +116,13 @@ OC.L10N.register(
     "Enable plugins": "Arbeit mit Plugins aktivieren",
     "Enable document protection for": "Hinzufügen von Passwörtern in Dokumenten aktivieren für",
     "All users": "Alle Benutzer",
-    "Owner only": "Nur Besitzer"
+    "Owner only": "Nur Besitzer",
+    "Authorization header (leave blank to use default header)" : "Authorization-Header (leer lassen, um die standardmäßige Kopfzeile zu verwenden)",
+    "ONLYOFFICE server is not available": "ONLYOFFICE-Server ist nicht verfügbar",
+    "Please check the settings to resolve the problem.": "Bitte überprüfen Sie die Einstellungen, um das Problem zu beheben.",
+    "View settings": "Einstellungen anzeigen",
+    "ONLYOFFICE Docs Cloud": "ONLYOFFICE Docs Cloud",
+    "Easily launch the editors in the cloud without downloading and installation": "Öffnen Sie die Editoren in der Cloud einfach ohne Herunterladen und Installation",
+    "Get Now": "Jetzt erhalten"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index b2af90dc..eb5b5f90 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -114,6 +114,13 @@
     "Enable plugins": "Arbeit mit Plugins aktivieren",
     "Enable document protection for": "Hinzufügen von Passwörtern in Dokumenten aktivieren für",
     "All users": "Alle Benutzer",
-    "Owner only": "Nur Besitzer"
+    "Owner only": "Nur Besitzer",
+    "Authorization header (leave blank to use default header)": "Authorization-Header (leer lassen, um die standardmäßige Kopfzeile zu verwenden)",
+    "ONLYOFFICE server is not available": "ONLYOFFICE-Server ist nicht verfügbar",
+    "Please check the settings to resolve the problem.": "Bitte überprüfen Sie die Einstellungen, um das Problem zu beheben.",
+    "View settings": "Einstellungen anzeigen",
+    "ONLYOFFICE Docs Cloud": "ONLYOFFICE Docs Cloud",
+    "Easily launch the editors in the cloud without downloading and installation": "Öffnen Sie die Editoren in der Cloud einfach ohne Herunterladen und Installation",
+    "Get Now": "Jetzt erhalten"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index 2becdc1d..fc25407c 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -116,6 +116,13 @@ OC.L10N.register(
     "Enable plugins": "Arbeit mit Plugins aktivieren",
     "Enable document protection for": "Hinzufügen von Passwörtern in Dokumenten aktivieren für",
     "All users": "Alle Benutzer",
-    "Owner only": "Nur Besitzer"
+    "Owner only": "Nur Besitzer",
+    "Authorization header (leave blank to use default header)": "Authorization-Header (leer lassen, um die standardmäßige Kopfzeile zu verwenden)",
+    "ONLYOFFICE server is not available": "ONLYOFFICE-Server ist nicht verfügbar",
+    "Please check the settings to resolve the problem.": "Bitte überprüfen Sie die Einstellungen, um das Problem zu beheben.",
+    "View settings": "Einstellungen anzeigen",
+    "ONLYOFFICE Docs Cloud": "ONLYOFFICE Docs Cloud",
+    "Easily launch the editors in the cloud without downloading and installation": "Öffnen Sie die Editoren in der Cloud einfach ohne Herunterladen und Installation",
+    "Get Now": "Jetzt erhalten"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index 05c7fcd9..967c3eb8 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -114,6 +114,13 @@
     "Enable plugins": "Arbeit mit Plugins aktivieren",
     "Enable document protection for": "Hinzufügen von Passwörtern in Dokumenten aktivieren für",
     "All users": "Alle Benutzer",
-    "Owner only": "Nur Besitzer"
+    "Owner only": "Nur Besitzer",
+    "Authorization header (leave blank to use default header)": "Authorization-Header (leer lassen, um die standardmäßige Kopfzeile zu verwenden)",
+    "ONLYOFFICE server is not available": "ONLYOFFICE-Server ist nicht verfügbar",
+    "Please check the settings to resolve the problem.": "Bitte überprüfen Sie die Einstellungen, um das Problem zu beheben.",
+    "View settings": "Einstellungen anzeigen",
+    "ONLYOFFICE Docs Cloud": "ONLYOFFICE Docs Cloud",
+    "Easily launch the editors in the cloud without downloading and installation": "Öffnen Sie die Editoren in der Cloud einfach ohne Herunterladen und Installation",
+    "Get Now": "Jetzt erhalten"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es.js b/l10n/es.js
index 28d6df4b..a2cb53eb 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -116,6 +116,13 @@ OC.L10N.register(
     "Enable plugins": "Habilitar plugins",
     "Enable document protection for": "Habilitar la protección de documentos para",
     "All users": "Todos los usuarios",
-    "Owner only": "Solo propietario"
+    "Owner only": "Solo propietario",
+    "Authorization header (leave blank to use default header)": "Encabezado de autenticación (dejar en blanco para utilizar el encabezado predeterminado)",
+    "ONLYOFFICE server is not available": "El servidor de ONLYOFFICE no está disponible",
+    "Please check the settings to resolve the problem.": "Por favor, compruebe la configuración para resolver el problema.",
+    "View settings": "Ver configuración",
+    "ONLYOFFICE Docs Cloud": "ONLYOFFICE Docs Cloud",
+    "Easily launch the editors in the cloud without downloading and installation": "Inicie fácilmente los editores en la nube sin tener que descargarlos ni instalarlos",
+    "Get Now": "Obtener ahora"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es.json b/l10n/es.json
index a58da59f..2713e30b 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -114,6 +114,13 @@
     "Enable plugins": "Habilitar plugins",
     "Enable document protection for": "Habilitar la protección de documentos para",
     "All users": "Todos los usuarios",
-    "Owner only": "Solo propietario"
+    "Owner only": "Solo propietario",
+    "Authorization header (leave blank to use default header)" : "Encabezado de autenticación (dejar en blanco para utilizar el encabezado predeterminado)",
+    "ONLYOFFICE server is not available": "El servidor de ONLYOFFICE no está disponible",
+    "Please check the settings to resolve the problem.": "Por favor, compruebe la configuración para resolver el problema.",
+    "View settings": "Ver configuración",
+    "ONLYOFFICE Docs Cloud": "ONLYOFFICE Docs Cloud",
+    "Easily launch the editors in the cloud without downloading and installation": "Inicie fácilmente los editores en la nube sin tener que descargarlos ni instalarlos",
+    "Get Now": "Obtener ahora"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/fr.js b/l10n/fr.js
index b9d60c6b..f1dfcaa9 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -65,11 +65,11 @@ OC.L10N.register(
     "Insert image" : "Insérer une image",
     "Select recipients" : "Sélectionner les destinataires",
     "Connect to demo ONLYOFFICE Docs server" : "Se connecter à la version démo de ONLYOFFICE Docs",
-    "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "C’est un serveur public proposé à des fins de tests, veuillez ne pas l’utiliser pour vos données personnelles sensibles. Le serveur est disponible pendant 30 jours.",
-    "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "La période d’essai de 30 jours est expirée, vous n’êtes plus en mesure de vous connecter à la version démo de ONLYOFFICE Docs.",
+    "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "C'est un serveur public proposé à des fins de tests, veuillez ne pas l'utiliser pour vos données personnelles sensibles. Le serveur est disponible pendant 30 jours.",
+    "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "La période d'essai de 30 jours est expirée, vous n'êtes plus en mesure de vous connecter à la version démo de ONLYOFFICE Docs.",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Vous utilisez la version démo de ONLYOFFICE Docs, proposée à des fins de tests. Veuillez ne pas stocker vos données confidentielles.",
     "Select file to compare" : "Sélectionner fichier à comparer",
-    "Review mode for viewing": "Mode révision lors de l’affichage",
+    "Review mode for viewing": "Mode révision lors de l'affichage",
     "Markup": "Balisage",
     "Final": "Finale",
     "Original": "Original",
@@ -95,8 +95,8 @@ OC.L10N.register(
     "File has been converted. Its content might look different.": "Le fichier a été converti. Son contenu peut s'afficher différemment.",
     "Download as": "Télécharger sous",
     "Download": "Télécharger",
-    "Origin format": "Format d’origin",
-    "Failed to send notification": "Échec de l’envoi de la notification",
+    "Origin format": "Format d'origin",
+    "Failed to send notification": "Échec de l'envoi de la notification",
     "Notification sent successfully": "Notification a été envoyée avec succès",
     "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s vous a mentionné dans %2\$s: \"%3\$s\".",
     "Choose a format to convert {fileName}": "Choisissez un format à convertir {fileName}",
@@ -116,6 +116,13 @@ OC.L10N.register(
     "Enable plugins": "Activer les plugins",
     "Enable document protection for": "Activer la protection des documents par mot de passe pour",
     "All users": "Tous les utilisateurs",
-    "Owner only": "Propriétaire uniquement"
+    "Owner only": "Propriétaire uniquement",
+    "Authorization header (leave blank to use default header)": "En-tête d'autorisation (laissez vide pour utiliser l'en-tête par défaut)",
+    "ONLYOFFICE server is not available": "Le serveur ONLYOFFICE n'est pas disponible",
+    "Please check the settings to resolve the problem.": "Veuillez vérifier les paramètres pour résoudre le problème.",
+    "View settings": "Afficher les paramètres",
+    "ONLYOFFICE Docs Cloud": "ONLYOFFICE Docs Cloud",
+    "Easily launch the editors in the cloud without downloading and installation": "Lancez facilement les éditeurs dans le cloud sans téléchargement ni installation",
+    "Get Now": "Obtenir maintenant"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/l10n/fr.json b/l10n/fr.json
index 34344ddd..959369dd 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -63,11 +63,11 @@
     "Insert image" : "Insérer une image",
     "Select recipients" : "Sélectionner les destinataires",
     "Connect to demo ONLYOFFICE Docs server" : "Se connecter à la version démo de ONLYOFFICE Docs",
-    "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "C’est un serveur public proposé à des fins de tests, veuillez ne pas l’utiliser pour vos données personnelles sensibles. Le serveur est disponible pendant 30 jours.",
-    "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "La période d’essai de 30 jours est expirée, vous n’êtes plus en mesure de vous connecter à la version démo de ONLYOFFICE Docs.",
+    "This is a public test server, please do not use it for private sensitive data. The server will be available during a 30-day period." : "C'est un serveur public proposé à des fins de tests, veuillez ne pas l'utiliser pour vos données personnelles sensibles. Le serveur est disponible pendant 30 jours.",
+    "The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server." : "La période d'essai de 30 jours est expirée, vous n'êtes plus en mesure de vous connecter à la version démo de ONLYOFFICE Docs.",
     "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data." : "Vous utilisez la version démo de ONLYOFFICE Docs, proposée à des fins de tests. Veuillez ne pas stocker vos données confidentielles.",
     "Select file to compare" : "Sélectionner fichier à comparer",
-    "Review mode for viewing": "Mode révision lors de l’affichage",
+    "Review mode for viewing": "Mode révision lors de l'affichage",
     "Markup": "Balisage",
     "Final": "Finale",
     "Original": "Original",
@@ -93,8 +93,8 @@
     "File has been converted. Its content might look different.": "Le fichier a été converti. Son contenu peut s'afficher différemment.",
     "Download as": "Télécharger sous",
     "Download": "Télécharger",
-    "Origin format": "Format d’origin",
-    "Failed to send notification": "Échec de l’envoi de la notification",
+    "Origin format": "Format d'origin",
+    "Failed to send notification": "Échec de l'envoi de la notification",
     "Notification sent successfully": "Notification a été envoyée avec succès",
     "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s vous a mentionné dans %2$s: \"%3$s\".",
     "Choose a format to convert {fileName}": "Choisissez un format à convertir {fileName}",
@@ -114,6 +114,13 @@
     "Enable plugins": "Activer les plugins",
     "Enable document protection for": "Activer la protection des documents par mot de passe pour",
     "All users": "Tous les utilisateurs",
-    "Owner only": "Propriétaire uniquement"
+    "Owner only": "Propriétaire uniquement",
+    "Authorization header (leave blank to use default header)": "En-tête d'autorisation (laissez vide pour utiliser l'en-tête par défaut)",
+    "ONLYOFFICE server is not available": "Le serveur ONLYOFFICE n'est pas disponible",
+    "Please check the settings to resolve the problem.": "Veuillez vérifier les paramètres pour résoudre le problème.",
+    "View settings": "Afficher les paramètres",
+    "ONLYOFFICE Docs Cloud": "ONLYOFFICE Docs Cloud",
+    "Easily launch the editors in the cloud without downloading and installation": "Lancez facilement les éditeurs dans le cloud sans téléchargement ni installation",
+    "Get Now": "Obtenir maintenant"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/l10n/it.js b/l10n/it.js
index 8338b245..ae29a205 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -116,6 +116,13 @@ OC.L10N.register(
     "Enable plugins": "Abilitare plugin",
     "Enable document protection for": "Abilitare la protezione del documento per",
     "All users": "Tutti gli utenti",
-    "Owner only": "Solo proprietario"
+    "Owner only": "Solo proprietario",
+    "Authorization header (leave blank to use default header)": "Intestazione di autorizzazione (lascia vuoto per utilizzare l'intestazione predefinita)",
+    "ONLYOFFICE server is not available": "Il server di ONLYOFFICE non è disponibile",
+    "Please check the settings to resolve the problem.": "Ti preghiamo di controllare le impostazioni per risolvere il problema.",
+    "View settings": "Visualizza impostazioni",
+    "ONLYOFFICE Docs Cloud": "ONLYOFFICE Docs nel Cloud",
+    "Easily launch the editors in the cloud without downloading and installation": "Avvia facilmente gli editor nel cloud senza scaricarli e installarli",
+    "Get Now": "Ottieni ora"
 },
-"nplurals=2; plural=(n != 1);");
\ No newline at end of file
+"nplurals=2; plural=(n != 1);");
diff --git a/l10n/it.json b/l10n/it.json
index d18a8601..0a0b4694 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -114,6 +114,13 @@
     "Enable plugins": "Abilitare plugin",
     "Enable document protection for": "Abilitare la protezione del documento per",
     "All users": "Tutti gli utenti",
-    "Owner only": "Solo proprietario"
+    "Owner only": "Solo proprietario",
+    "Authorization header (leave blank to use default header)" : "Intestazione di autorizzazione (lascia vuoto per utilizzare l'intestazione predefinita)",
+    "ONLYOFFICE server is not available": "Il server di ONLYOFFICE non è disponibile",
+    "Please check the settings to resolve the problem.": "Ti preghiamo di controllare le impostazioni per risolvere il problema.",
+    "View settings": "Visualizza impostazioni",
+    "ONLYOFFICE Docs Cloud": "ONLYOFFICE Docs nel Cloud",
+    "Easily launch the editors in the cloud without downloading and installation": "Avvia facilmente gli editor nel cloud senza scaricarli e installarli",
+    "Get Now": "Ottieni ora"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/ja.js b/l10n/ja.js
index 315005f3..daa72df4 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -116,6 +116,13 @@ OC.L10N.register(
     "Enable plugins": "プラグインを有効にする",
     "Enable document protection for": "次のユーザーに対して文書の保護機能を有効にする",
     "All users": "すべてのユーザー",
-    "Owner only": "所有者のみ"
+    "Owner only": "所有者のみ",
+    "Authorization header (leave blank to use default header)": "認証ヘッダー (デフォルトのヘッダーを使用したい場合は空白にしてください)",
+    "ONLYOFFICE server is not available": "ONLYOFFICEサーバーは只今利用できません",
+    "Please check the settings to resolve the problem.": "問題を解決するために設定をご確認ください。",
+    "View settings": "設定を見る",
+    "ONLYOFFICE Docs Cloud": "ONLYOFFICE Docs Cloud",
+    "Easily launch the editors in the cloud without downloading and installation": "ダウンロードやインストールをすることなく、クラウド上で簡単にエディタを起動することができます",
+    "Get Now": "今すぐ使ってみる"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/ja.json b/l10n/ja.json
index 45971a92..b33590db 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -114,6 +114,13 @@
     "Enable plugins": "プラグインを有効にする",
     "Enable document protection for": "次のユーザーに対して文書の保護機能を有効にする",
     "All users": "すべてのユーザー",
-    "Owner only": "所有者のみ"
+    "Owner only": "所有者のみ",
+    "Authorization header (leave blank to use default header)": "認証ヘッダー (デフォルトのヘッダーを使用したい場合は空白にしてください)",
+    "ONLYOFFICE server is not available": "ONLYOFFICEサーバーは只今利用できません",
+    "Please check the settings to resolve the problem.": "問題を解決するために設定をご確認ください。",
+    "View settings": "設定を見る",
+    "ONLYOFFICE Docs Cloud": "ONLYOFFICE Docs Cloud",
+    "Easily launch the editors in the cloud without downloading and installation": "ダウンロードやインストールをすることなく、クラウド上で簡単にエディタを起動することができます",
+    "Get Now": "今すぐ使ってみる"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index 4438622f..5a8b9747 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -107,12 +107,22 @@ OC.L10N.register(
     "Create new Form template": "Criar novo modelo de Formulário",
     "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Atualize o ONLYOFFICE Docs para a versão 7.0 para trabalhar em formulários preenchíveis online",
     "Security": "Segurança",
+    "Run document macros": "Executar macros de documento",
+    "Default editor theme": "Tema do editor padrão",
     "Light": "Claro",
     "Classic Light": "Clássico claro",
     "Dark": "Escuro",
+    "This feature is unavailable due to encryption settings.": "Este recurso não está disponível devido às configurações de criptografia.",
     "Enable plugins": "Ativar plug-ins",
     "Enable document protection for": "Ativar proteção de documento para",
     "All users": "Todos os usuários",
-    "Owner only": "Somente proprietário"
+    "Owner only": "Somente proprietário",
+    "Authorization header (leave blank to use default header)": "Cabeçalho de autorização (deixe em branco para usar o cabeçalho padrão)",
+    "ONLYOFFICE server is not available": "O servidor ONLYOFFICE não está disponível",
+    "Please check the settings to resolve the problem.": "Verifique as configurações para resolver o problema.",
+    "View settings": "Configurações de exibição",
+    "ONLYOFFICE Docs Cloud": "ONLYOFFICE Docs Cloud",
+    "Easily launch the editors in the cloud without downloading and installation": "Inicie facilmente os editores na nuvem sem download e instalação",
+    "Get Now": "Obter agora"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index 84d22e16..02352a56 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -105,12 +105,22 @@
     "Create new Form template": "Criar novo modelo de Formulário",
     "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Atualize o ONLYOFFICE Docs para a versão 7.0 para trabalhar em formulários preenchíveis online",
     "Security": "Segurança",
+    "Run document macros": "Executar macros de documento",
+    "Default editor theme": "Tema do editor padrão",
     "Light": "Claro",
     "Classic Light": "Clássico claro",
     "Dark": "Escuro",
+    "This feature is unavailable due to encryption settings.": "Este recurso não está disponível devido às configurações de criptografia.",
     "Enable plugins": "Ativar plug-ins",
     "Enable document protection for": "Ativar proteção de documento para",
     "All users": "Todos os usuários",
-    "Owner only": "Somente proprietário"
+    "Owner only": "Somente proprietário",
+    "Authorization header (leave blank to use default header)": "Cabeçalho de autorização (deixe em branco para usar o cabeçalho padrão)",
+    "ONLYOFFICE server is not available": "O servidor ONLYOFFICE não está disponível",
+    "Please check the settings to resolve the problem.": "Verifique as configurações para resolver o problema.",
+    "View settings": "Configurações de exibição",
+    "ONLYOFFICE Docs Cloud": "ONLYOFFICE Docs Cloud",
+    "Easily launch the editors in the cloud without downloading and installation": "Inicie facilmente os editores na nuvem sem download e instalação",
+    "Get Now": "Obter agora"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
-}
+}
\ No newline at end of file
diff --git a/l10n/ru.js b/l10n/ru.js
index 4f698bd0..1084136a 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -116,6 +116,13 @@ OC.L10N.register(
     "Enable plugins": "Включить работу с плагинами",
     "Enable document protection for": "Включить возможность задавать пароль на документ для",
     "All users": "Всех пользователей",
-    "Owner only": "Только владельцу"
+    "Owner only": "Только владельцу",
+    "Authorization header (leave blank to use default header)": "Заголовок авторизации (оставьте пустым, чтобы использовать заголовок по умолчанию)",
+    "ONLYOFFICE server is not available": "Сервер ONLYOFFICE недоступен",
+    "Please check the settings to resolve the problem.": "Пожалуйста, проверьте настройки, чтобы решить проблему.",
+    "View settings": "Посмотреть настройки",
+    "ONLYOFFICE Docs Cloud": "ONLYOFFICE Docs Cloud",
+    "Easily launch the editors in the cloud without downloading and installation": "Легко запускайте редакторы в облаке без скачивания и установки",
+    "Get Now": "Получить сейчас"
 },
 "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
diff --git a/l10n/ru.json b/l10n/ru.json
index 13cc0fd2..49245a51 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -114,6 +114,13 @@
     "Enable plugins": "Включить работу с плагинами",
     "Enable document protection for": "Включить возможность задавать пароль на документ для",
     "All users": "Всех пользователей",
-    "Owner only": "Только владельцу"
+    "Owner only": "Только владельцу",
+    "Authorization header (leave blank to use default header)": "Заголовок авторизации (оставьте пустым, чтобы использовать заголовок по умолчанию)",
+    "ONLYOFFICE server is not available": "Сервер ONLYOFFICE недоступен",
+    "Please check the settings to resolve the problem.": "Пожалуйста, проверьте настройки, чтобы решить проблему.",
+    "View settings": "Посмотреть настройки",
+    "ONLYOFFICE Docs Cloud": "ONLYOFFICE Docs Cloud",
+    "Easily launch the editors in the cloud without downloading and installation": "Легко запускайте редакторы в облаке без скачивания и установки",
+    "Get Now": "Получить сейчас"
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
 }
\ No newline at end of file
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
index c9ee95f2..f732f498 100644
--- a/l10n/zh_CN.js
+++ b/l10n/zh_CN.js
@@ -107,6 +107,7 @@ OC.L10N.register(
     "Create new Form template": "创建新的表单模板",
     "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "请将ONLYOFFICE Docs更新到7.0版本，以便在线编辑可填写的表单",
     "Security": "安全",
+    "Run document macros": "运行文档宏",
     "Default editor theme": "编辑器默认的主题",
     "Light": "光",
     "Classic Light": "经典浅色",
@@ -115,6 +116,13 @@ OC.L10N.register(
     "Enable plugins": "启用插件",
     "Enable document protection for": "为以下用户启用文档保护",
     "All users": "所有用户",
-    "Owner only": "仅限所有者"
+    "Owner only": "仅限所有者",
+    "Authorization header (leave blank to use default header)": "授权标头 (留空以使用默认的标头)",
+    "ONLYOFFICE server is not available": "ONLYOFFICE 服务器不可用",
+    "Please check the settings to resolve the problem.": "请检查设置以解决问题。",
+    "View settings": "查看设置",
+    "ONLYOFFICE Docs Cloud": "ONLYOFFICE 文档云",
+    "Easily launch the editors in the cloud without downloading and installation": "无需下载和安装即可轻松启动云端编辑器",
+    "Get Now": "立即获取"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index f77782e3..dec2a79e 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -105,6 +105,7 @@
     "Create new Form template": "创建新的表单模板",
     "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "请将ONLYOFFICE Docs更新到7.0版本，以便在线编辑可填写的表单",
     "Security": "安全",
+    "Run document macros": "运行文档宏",
     "Default editor theme": "编辑器默认的主题",
     "Light": "光",
     "Classic Light": "经典浅色",
@@ -113,6 +114,13 @@
     "Enable plugins": "启用插件",
     "Enable document protection for": "为以下用户启用文档保护",
     "All users": "所有用户",
-    "Owner only": "仅限所有者"
+    "Owner only": "仅限所有者",
+    "Authorization header (leave blank to use default header)": "授权标头 (留空以使用默认的标头)",
+    "ONLYOFFICE server is not available": "ONLYOFFICE 服务器不可用",
+    "Please check the settings to resolve the problem.": "请检查设置以解决问题。",
+    "View settings": "查看设置",
+    "ONLYOFFICE Docs Cloud": "ONLYOFFICE 文档云",
+    "Easily launch the editors in the cloud without downloading and installation": "无需下载和安装即可轻松启动云端编辑器",
+    "Get Now": "立即获取"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/appconfig.php b/lib/appconfig.php
index 99d44ed9..083c93a7 100644
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -298,6 +298,13 @@ class AppConfig {
      */
     public $_customizationPlugins = "customization_plugins";
 
+    /**
+     * The config key for the interval of editors availability check by cron
+     *
+     * @var string
+     */
+    private $_editors_check_interval = "editors_check_interval";
+
     /**
      * @param string $AppName - application name
      */
@@ -1055,20 +1062,41 @@ public function GetLimitThumbSize() {
     /**
      * Get the jwt header setting
      *
+     * @param bool $origin - take origin
+     *
      * @return string
      */
-    public function JwtHeader() {
-        if ($this->UseDemo()) {
+    public function JwtHeader($origin = false) {
+        if (!$origin && $this->UseDemo()) {
             return $this->DEMO_PARAM["HEADER"];
         }
 
-        $header = $this->GetSystemValue($this->_jwtHeader);
+        $header = $this->config->getAppValue($this->appName, $this->_jwtHeader, "");
         if (empty($header)) {
+            $header = $this->GetSystemValue($this->_jwtHeader);
+        }
+        if (!$origin && empty($header)) {
             $header = "Authorization";
         }
         return $header;
     }
 
+    /**
+     * Save the jwtHeader setting
+     *
+     * @param string $value - jwtHeader
+     */
+    public function SetJwtHeader($value) {
+        $value = trim($value);
+        if (empty($value)) {
+            $this->logger->info("Clear header key", ["app" => $this->appName]);
+        } else {
+            $this->logger->info("Set header key " . $value, ["app" => $this->appName]);
+        }
+
+        $this->config->setAppValue($this->appName, $this->_jwtHeader, $value);
+    }
+
     /**
      * Get the Jwt Leeway
      *
@@ -1156,6 +1184,20 @@ public function ShareAttributesVersion() {
         return "";
     }
 
+    /**
+     * Get the editors check interval
+     *
+     * @return int
+     */
+    public function GetEditorsCheckInterval() {
+        $interval = $this->GetSystemValue($this->_editors_check_interval);
+
+        if (empty($interval)) {
+            $interval = 60*60*24;
+        }
+        return (integer)$interval;
+    }
+
     /**
      * Additional data about formats
      *
@@ -1193,7 +1235,7 @@ public function ShareAttributesVersion() {
         "txt" => [ "mime" => "text/plain", "type" => "word", "edit" => true, "editable" => true, "saveas" => ["docx", "odt", "pdf", "rtf"] ],
         "xls" => [ "mime" => "application/vnd.ms-excel", "type" => "cell", "conv" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ],
         "xlsm" => [ "mime" => "application/vnd.ms-excel.sheet.macroEnabled.12", "type" => "cell", "conv" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ],
-        "xlsx" => [ "mime" => "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "type" => "cell", "edit" => true, "def" => true, "comment" => true, "modifyFilter" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ],
+        "xlsx" => [ "mime" => "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "type" => "cell", "edit" => true, "def" => true, "comment" => true, "modifyFilter" => true, "saveas" => ["csv", "ods", "pdf"] ],
         "xlt" => [ "type" => "cell", "conv" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ],
         "xltm" => [ "mime" => "application/vnd.ms-excel.template.macroEnabled.12", "type" => "cell", "conv" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ],
         "xltx" => [ "mime" => "application/vnd.openxmlformats-officedocument.spreadsheetml.template", "type" => "cell", "conv" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ]
@@ -1208,4 +1250,15 @@ public function ShareAttributesVersion() {
         "SECRET" => "sn2puSUF7muF5Jas",
         "TRIAL" => 30
     ];
+
+    private $linkToDocs = "https://www.onlyoffice.com/docs-registration.aspx?referer=owncloud";
+
+    /**
+     * Get link to Docs Cloud
+     *
+     * @return string
+     */
+    public function GetLinkToDocs() {
+        return $this->linkToDocs;
+    }
 }
diff --git a/lib/cron/editorscheck.php b/lib/cron/editorscheck.php
new file mode 100644
index 00000000..65df9458
--- /dev/null
+++ b/lib/cron/editorscheck.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ *
+ * (c) Copyright Ascensio System SIA 2023
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+namespace OCA\Onlyoffice\Cron;
+
+use OC\BackgroundJob\TimedJob;
+
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\IGroup;
+use OCP\IGroupManager;
+use OCP\IL10N;
+use OCP\ILogger;
+use OCP\IURLGenerator;
+
+use OCA\Onlyoffice\AppConfig;
+use OCA\Onlyoffice\Crypt;
+use OCA\Onlyoffice\DocumentService;
+
+/**
+ * Editors availability check background job
+ *
+ */
+class EditorsCheck extends TimedJob {
+
+    /**
+     * Application name
+     *
+     * @var string
+     */
+    private $appName;
+
+    /**
+     * Url generator service
+     *
+     * @var IURLGenerator
+     */
+    private $urlGenerator;
+
+    /**
+     * Logger
+     *
+     * @var OCP\ILogger
+     */
+    private $logger;
+
+    /**
+     * Application configuration
+     *
+     * @var AppConfig
+     */
+    private $config;
+
+    /**
+     * l10n service
+     *
+     * @var IL10N
+     */
+    private $trans;
+
+    /**
+     * Hash generator
+     *
+     * @var Crypt
+     */
+    private $crypt;
+
+    /**
+     * Group manager
+     *
+     * @var IGroupManager
+     */
+    private $groupManager;
+
+    /**
+     * @param string $AppName - application name
+     * @param IURLGenerator $urlGenerator - url generator service
+     * @param ITimeFactory $time - time
+     * @param AppConfig $config - application configuration
+     * @param IL10N $trans - l10n service
+     * @param Crypt $crypt - crypt service
+     */
+    public function __construct(string $AppName,
+                                IURLGenerator $urlGenerator,
+                                ITimeFactory $time,
+                                AppConfig $config,
+                                IL10N $trans,
+                                Crypt $crypt,
+                                IGroupManager $groupManager) {
+        $this->appName = $AppName;
+        $this->urlGenerator = $urlGenerator;
+
+        $this->logger = \OC::$server->getLogger();
+        $this->config = $config;
+        $this->trans = $trans;
+        $this->crypt = $crypt;
+        $this->groupManager = $groupManager;
+        $this->setInterval($this->config->GetEditorsCheckInterval());
+    }
+
+    /**
+     * Makes the background check
+     *
+     * @param array $argument unused argument
+     */
+    protected function run($argument) {
+        if (empty($this->config->GetDocumentServerUrl())) {
+            $this->logger->debug("Settings are empty", ["app" => $this->appName]);
+            return;
+        }
+        if (!$this->config->SettingsAreSuccessful()) {
+            $this->logger->debug("Settings are not correct", ["app" => $this->appName]);
+            return;
+        }
+        $fileUrl = $this->urlGenerator->linkToRouteAbsolute($this->appName . ".callback.emptyfile");
+        if (!$this->config->UseDemo() && !empty($this->config->GetStorageUrl())) {
+            $fileUrl = str_replace($this->urlGenerator->getAbsoluteURL("/"), $this->config->GetStorageUrl(), $fileUrl);
+        }
+        if (parse_url($fileUrl)["host"] === "localhost") {
+            $this->logger->debug("Localhost is not alowed for cron editors availability check.", ["app" => $this->appName]);
+            return; 
+        }
+
+        $this->logger->debug("ONLYOFFICE check started by cron", ["app" => $this->appName]);
+
+        $documentService = new DocumentService($this->trans, $this->config);
+        list ($error, $version) = $documentService->checkDocServiceUrl($this->urlGenerator, $this->crypt);
+        if (!empty($error)) {
+            $this->logger->info("ONLYOFFICE server is not available", ["app" => $this->appName]);
+            $this->config->SetSettingsError($error);
+            $this->notifyAdmins();
+        } else {
+            $this->logger->debug("ONLYOFFICE server availability check is finished successfully", ["app" => $this->appName]);
+        }
+    }
+
+    /**
+     * Get the list of users to notify
+     *
+     * @return string[]
+     */
+    private function getUsersToNotify() {
+        $notifyGroups = ["admin"];
+        $notifyUsers = [];
+
+        foreach ($notifyGroups as $notifyGroup) {
+            $group = $this->groupManager->get($notifyGroup);
+            if ($group === null || !($group instanceof IGroup)) {
+                continue;
+            }
+            $users = $group->getUsers();
+            foreach ($users as $user) {
+                $notifyUsers[] = $user->getUID();
+            }
+        }
+        return $notifyUsers;
+    }
+
+    /**
+     * Send notification to admins
+     * @return void
+     */
+    private function notifyAdmins() {
+        $notificationManager = \OC::$server->getNotificationManager();
+        $notification = $notificationManager->createNotification();
+        $notification->setApp($this->appName)
+            ->setDateTime(new \DateTime())
+            ->setObject("editorsCheck", $this->trans->t("ONLYOFFICE server is not available"))
+            ->setSubject("editorscheck_info");
+        foreach ($this->getUsersToNotify() as $uid) {
+            $notification->setUser($uid);
+            $notificationManager->notify($notification);
+        }
+    }
+
+}
diff --git a/lib/crypt.php b/lib/crypt.php
index 7092b6b7..5b81ab40 100644
--- a/lib/crypt.php
+++ b/lib/crypt.php
@@ -50,7 +50,7 @@ public function __construct(AppConfig $appConfig) {
      * @return string
      */
     public function GetHash($object) {
-        return \Firebase\JWT\JWT::encode($object, $this->config->GetSKey());
+        return \Firebase\JWT\JWT::encode($object, $this->config->GetSKey(), "HS256");
     }
 
     /**
@@ -67,7 +67,7 @@ public function ReadHash($token) {
             return [$result, "token is empty"];
         }
         try {
-            $result = \Firebase\JWT\JWT::decode($token, $this->config->GetSKey(), array("HS256"));
+            $result = \Firebase\JWT\JWT::decode($token, new \Firebase\JWT\Key($this->config->GetSKey(), "HS256"));
         } catch (\UnexpectedValueException $e) {
             $error = $e->getMessage();
         }
diff --git a/lib/documentservice.php b/lib/documentservice.php
index 65bc2baf..ead9d9d4 100644
--- a/lib/documentservice.php
+++ b/lib/documentservice.php
@@ -161,10 +161,10 @@ function SendRequestToConvertService($document_uri, $from_extension, $to_extensi
             $params = [
                 "payload" => $data
             ];
-            $token = \Firebase\JWT\JWT::encode($params, $this->config->GetDocumentServerSecret());
+            $token = \Firebase\JWT\JWT::encode($params, $this->config->GetDocumentServerSecret(), "HS256");
             $opts["headers"][$this->config->JwtHeader()] = "Bearer " . $token;
 
-            $token = \Firebase\JWT\JWT::encode($data, $this->config->GetDocumentServerSecret());
+            $token = \Firebase\JWT\JWT::encode($data, $this->config->GetDocumentServerSecret(), "HS256");
             $data["token"] = $token;
             $opts["body"] = json_encode($data);
         }
@@ -288,10 +288,10 @@ function CommandRequest($method) {
             $params = [
                 "payload" => $data
             ];
-            $token = \Firebase\JWT\JWT::encode($params, $this->config->GetDocumentServerSecret());
+            $token = \Firebase\JWT\JWT::encode($params, $this->config->GetDocumentServerSecret(), "HS256");
             $opts["headers"][$this->config->JwtHeader()] = "Bearer " . $token;
 
-            $token = \Firebase\JWT\JWT::encode($data, $this->config->GetDocumentServerSecret());
+            $token = \Firebase\JWT\JWT::encode($data, $this->config->GetDocumentServerSecret(), "HS256");
             $data["token"] = $token;
             $opts["body"] = json_encode($data);
         }
@@ -430,7 +430,7 @@ public function checkDocServiceUrl($urlGenerator, $crypt) {
 
             $hashUrl = $crypt->GetHash(["action" => "empty"]);
             $fileUrl = $urlGenerator->linkToRouteAbsolute(self::$appName . ".callback.emptyfile", ["doc" => $hashUrl]);
-            if (!empty($this->config->GetStorageUrl())) {
+            if (!$this->config->UseDemo() && !empty($this->config->GetStorageUrl())) {
                 $fileUrl = str_replace($urlGenerator->getAbsoluteURL("/"), $this->config->GetStorageUrl(), $fileUrl);
             }
 
diff --git a/lib/notifier.php b/lib/notifier.php
index 557db2bc..42773a4b 100644
--- a/lib/notifier.php
+++ b/lib/notifier.php
@@ -95,28 +95,42 @@ public function prepare($notification, $languageCode) {
         }
 
         $parameters = $notification->getSubjectParameters();
-
-        $notifierId = $parameters["notifierId"];
-        $fileId = $parameters["fileId"];
-        $fileName = $parameters["fileName"];
-        $anchor = $parameters["anchor"];
-
-        $this->logger->info("Notify prepare: from $notifierId about $fileId ", ["app" => $this->appName]);
-
-        $notifier = $this->userManager->get($notifierId);
-        $notifierName = $notifier->getDisplayName();
         $trans = $this->l10nFactory->get($this->appName, $languageCode);
 
-        $notification->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath($this->appName, "app-dark.svg")));
-        $notification->setParsedSubject($trans->t("%1\$s mentioned in the %2\$s: \"%3\$s\".", [$notifierName, $fileName, $notification->getObjectId()]));
-
-        $editorLink = $this->urlGenerator->linkToRouteAbsolute($this->appName . ".editor.index", [
-            "fileId" => $fileId,
-            "anchor" => $anchor
-        ]);
-
-        $notification->setLink($editorLink);
-
+        switch ($notification->getObjectType()) {
+            case "editorsCheck":
+                $message = $trans->t("Please check the settings to resolve the problem.");
+                $appSettingsLink = $this->urlGenerator->getAbsoluteURL("/settings/admin?sectionid=additional");
+                $notification->setLink($appSettingsLink);
+                $notification->setParsedSubject($notification->getObjectId())
+                    ->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath($this->appName, 'app-dark.svg')));
+                $notification->setParsedMessage($message);
+                break;
+            case "mention":
+                $notifierId = $parameters["notifierId"];
+                $fileId = $parameters["fileId"];
+                $fileName = $parameters["fileName"];
+                $anchor = $parameters["anchor"];
+
+                $this->logger->info("Notify prepare: from $notifierId about $fileId ", ["app" => $this->appName]);
+
+                $notifier = $this->userManager->get($notifierId);
+                $notifierName = $notifier->getDisplayName();
+                $trans = $this->l10nFactory->get($this->appName, $languageCode);
+
+                $notification->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath($this->appName, "app-dark.svg")));
+                $notification->setParsedSubject($trans->t("%1\$s mentioned in the %2\$s: \"%3\$s\".", [$notifierName, $fileName, $notification->getObjectId()]));
+
+                $editorLink = $this->urlGenerator->linkToRouteAbsolute($this->appName . ".editor.index", [
+                    "fileId" => $fileId,
+                    "anchor" => $anchor
+                ]);
+
+                $notification->setLink($editorLink);
+                break;
+            default:
+                $this->logger->info("Unsupported notification object: ".$notification->getObjectType(), ["app" => $this->appName]);
+        }
         return $notification;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/preview.php b/lib/preview.php
index ef5dbb23..026da674 100644
--- a/lib/preview.php
+++ b/lib/preview.php
@@ -321,7 +321,7 @@ private function getUrl($file, $user = null, $version = 0) {
 
         $fileUrl = $this->urlGenerator->linkToRouteAbsolute($this->appName . ".callback.download", ["doc" => $hashUrl]);
 
-        if (!empty($this->config->GetStorageUrl())) {
+        if (!$this->config->UseDemo() && !empty($this->config->GetStorageUrl())) {
             $fileUrl = str_replace($this->urlGenerator->getAbsoluteURL("/"), $this->config->GetStorageUrl(), $fileUrl);
         }
 
diff --git a/lib/templatemanager.php b/lib/templatemanager.php
index bdcf2bf7..eff5ab69 100644
--- a/lib/templatemanager.php
+++ b/lib/templatemanager.php
@@ -194,6 +194,7 @@ public static function GetEmptyTemplatePath($lang, $ext) {
         "en" => "en-US",
         "en_GB" => "en-GB",
         "es" => "es-ES",
+        "eu" => "eu-ES",
         "fr" => "fr-FR",
         "gl" => "gl-ES",
         "it" => "it-IT",
@@ -205,11 +206,13 @@ public static function GetEmptyTemplatePath($lang, $ext) {
         "pt_BR" => "pt-BR",
         "pt_PT" => "pt-PT",
         "ru" => "ru-RU",
+        "si_LK" => "si-LK",
         "sk_SK" => "sk-SK",
         "sv" => "sv-SE",
         "tr" => "tr-TR",
         "uk" => "uk-UA",
         "vi" => "vi-VN",
-        "zh_CN" => "zh-CN"
+        "zh_CN" => "zh-CN",
+        "zh_TW" => "zh-TW"
     ];
 }
\ No newline at end of file
diff --git a/templates/settings.php b/templates/settings.php
index 70796d72..94a840cc 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -63,6 +63,9 @@
             </a>
         </p>
         <div id="onlyofficeSecretPanel" class="onlyoffice-hide">
+            <p class="onlyoffice-header"><?php p($l->t("Authorization header (leave blank to use default header)")) ?></p>
+            <p><input id="onlyofficeJwtHeader" value="<?php p($_["jwtHeader"]) ?>" placeholder="Authorization" type="text"></p>
+
             <p class="onlyoffice-header"><?php p($l->t("ONLYOFFICE Docs address for internal requests from the server")) ?></p>
             <p><input id="onlyofficeInternalUrl" value="<?php p($_["documentserverInternal"]) ?>" placeholder="https://<documentserver>/" type="text"></p>
 
@@ -88,6 +91,26 @@
             <em><?php p($l->t("The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Docs server.")) ?></em>
             <?php } ?>
         </div>
+
+        <div id="onlyofficeDocsCloudBannerWrapper">
+        <div id="onlyofficeDocsCloudBannerPicWrapper">
+            <div id="onlyofficeDocsCloudBannerPic">
+
+            </div>
+        </div>
+        <div id="onlyofficeDocsCloudBannerContent">
+            <div id="onlyofficeDocsCloudBannerContentText">
+                <p><h2>ONLYOFFICE Docs Cloud</h2></p>
+                <p><?php p($l->t("Easily launch the editors in the cloud without downloading and installation")) ?></p>
+            </div>
+            <div id="onlyofficeDocsCloudBannerContentButtonWrapper">
+                <a id="onlyofficeDocsCloudBannerContentButton" class="button" href="<?php p($_["linkToDocs"]) ?>" target="_blank">
+                    <?php p($l->t("Get Now")) ?>
+                </a>
+            </div>
+        </div>
+    </div>
+
     </div>
 
     <div class="section-onlyoffice-2 <?php if (empty($_["documentserver"]) && !$_["demo"]["enabled"] || !$_["successful"]) { ?>onlyoffice-hide<?php } ?>">