Merge branch '2576_duplicate_symbols'