Merge "Fix extra text appearing after ellipsis"