Forward port #5463 into CMSSW_7_3_X