Merge pull request #17452 from eileenmcnaughton/dummy_bag