Merge "Add missing functor for DVR API" into oc-dev