[Hotfix] XRES-1151