Re: [Hotfix] XRES-1890