Updating fork to CMSSW