Revert previous revert
Merge topic 'missing-dependency-error' into next

34f6a4fd Revert previous revert