Merge "Fix the bug that generates multiple definition of references"