fixes #29231
fixes #29228