Merge "Remove user preference "noconvertlink""