Merge pull request #18555 from eileenmcnaughton/del_primary