[Hotfix] OPD-414