Merge pull request #18133 from gregomni/8324