[Hotfix] XRES-2023 / XRES-2024