[Hotfix] [CRON] XRES-6551 / XPUR-251