Merge "Fix the duplicated references"