95af6096fb
Fixes #11651 (cherry picked from commit 02fa329a7c2190d947cd5e02ea90d2d4406653be)
Fixes #11651 (cherry picked from commit 02fa329a7c2190d947cd5e02ea90d2d4406653be)