Merge "fix orphan module issue"