This is a manual sweep of !57248 (merged) as the automatic sweep failed unfortunately.
Only the part related to the jet flags is migrated to 22.0 because this will be needed for physics validation for example. The other items are not needed in 22.0 and are therefore not added here (to also reduce the amount of changes that have to be reviewed).