Merge "Make sure dvr functions are prepended with dvr" into oc-dev