Use validPercentOfTotal
as source of truth
#5636
Merged
validPercentOfTotal
as source of truth
#5636