Fixed module dependency (related to issue 7259)
Merge remote-tracking branch 'origin/master' into jsd2