Fixes: #13051 Replaces: #13064 (cherry picked from commit 4094c4bf) (cherry picked from commit 7f32a819) (cherry picked from commit b8c99088)