[Hotfix] [Config][OPD] XRES-1608