Merge pull request #12785 from wtgodbe/DeleteTest