Merge pull request #9568 from eleuzi01/issue-9473

Backport 3.6: Fix incorrect dependencies