Merge pull request #16442 from nwidger/delve-1.7.1