Merge "Rewrite link type checking"