Merging from CMSSW 62X