Sync DESY branch with cmg-central

Getting updates from the cmg-central MiniAOD branch.