Fixes: #16721 (cherry picked from commit 5b5ce629)
mentioned in commit 86145043
mentioned in commit 74d7c53e