Merge "modified to enable the DVR on the deployment by default."