Clean-up.
Fix b-tag discriminator.
Merge pull request #6780 from vadler/74X-updateTopRefSel

74X - update TopRefSel