[Hotfix] OPD-734