Merge pull request #13245 from ray-wright/patch-2