task #015-Custom_module_fixes: MInor fix
Merge branch '015-Custom_module_fixes' into develop