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