Fixes: #13051 Replaces: #13064 (cherry picked from commit 4094c4bf)
mentioned in commit b8c99088
mentioned in commit 72e4b997