Merge pull request #14196 from pprindeville/issue#14195