Merge pull request #18042 from nwidger/delve-1.8.2