Merge pull request #14048 from ryandesign/patch-1