Fixing paths in custom modules.
Merge remote-tracking branch 'origin/feature-vs-fixing_paths_in_custom_modules' into develop