Fix for module fetch in component controller
Merge branch 'develop' into media