Merge pull request #15685 from eileenmcnaughton/refund_allocate