Follow-up to d9710212 [skip ci]
Merge pull request #18114 from jonatack/patch-8

Follow-up to d971021 [skip ci]