[REFACTOR] fixes #35794 @0.3
Merge branch 'feature-35794' into release-1.1.0