Merge "findModule method refactoring"