Backport #28654 Fixes #15981 (cherry picked from commit 9210ce4045897ebd03a5767b8f7fcf56ff11bf6d)
text