keep FlavorTagDiscriminants in sync with main
cherry-pick @lwinkler's MRs !73925 (merged) and !73948 (merged).
Anything that touches FlavorTagDiscriminants
package should go in 24.0
cherry-pick @lwinkler's MRs !73925 (merged) and !73948 (merged).
Anything that touches FlavorTagDiscriminants
package should go in 24.0