Fixes: #22060 (cherry picked from commit f699bd81) (cherry picked from commit 3c5c13f8) (cherry picked from commit 9ee300a0)