Merge pull request #18798 from eileenmcnaughton/memtest