Merge pull request #19865 from pprindeville/issue#19757