Merge "Adding a new option CONF.network.dvr_extra_resources"