Merge pull request #35500 from resilient-tech/remove-wl