Merge pull request #19067 from eileenmcnaughton/weight