Merge pull request #36163 from resilient-tech/consistent-quotes