Merge #1814 after JIT changes

[bettio]

PR #1814 fails after JIT changes, apply fix before merging it to main.

These changes are made under both the "Apache 2.0" and the "GNU Lesser General Public License 2.1 or later" license terms (dual license).

SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later