Tagset 133577 reloaded

Rebased on top of CMSSW_7_0_X to avoid duplicated commits.