Merge pull request #22962 from tschuettler/patch-12