Minimal changes w.r.t official CMSSW