keep FlavorTagDiscriminants in sync with main

BinBin Dongrequested to merge
bdong-24.0-patch-25f1 into 24.0

cherry-pick @lwinkler's MRs !73925 (merged) and !73948 (merged).

Anything that touches FlavorTagDiscriminants package should go in 24.0

Merge request reports