The issue seems already fixed by PR #16982 and its follow-up commit 4934ba21. (cherry picked from commit 766f8f38)