[REFACTOR] fixes #35794 @0.3