Merge "Remove ControllerLink"