[REFACTOR] fixes #35787 @0.3 tried to merge 35791, but it is too old