Fixed missing modules
Merge branch 'hotfix/release-9-fixes'