Merge "Fix self link issues about titles in different or mixed variants"