[Hotfix] XRES-1920