chore: fix errors on merging develop
to 4.6
#9332
Merged
Loading
develop
to 4.6
#9332