Fixes: #14362 (cherry picked from commit 601f91be) (cherry picked from commit 608d8827)
mentioned in commit 9b72a0f6