Merge pull request #18662 from eileenmcnaughton/blockdel2