Fixes: #14362 (cherry picked from commit 601f91be) (cherry picked from commit 608d8827) (cherry picked from commit 19af11dc)