Merge "Fix error in loader.discover() call"