[Hotfix] OPD-560