Merge pull request #14184 from pprindeville/issue#14183