Merge pull request #16691 from mattwire/eventcart_cleanup