Merge from official CMSSW