Fixes: #22060 (cherry picked from commit f699bd81) (cherry picked from commit 3c5c13f8)
mentioned in commit 5f9a81e0