Fixes: #16721 (cherry picked from commit 5b5ce629) (cherry picked from commit f44ec1de) (cherry picked from commit 9d3eb211) (cherry picked from commit 74d7c53e)