Merge pull request #18982 from mlutfy/wp82