Merge "Fix link_type checking"