Merge: Fix Opportunity behavior with unicode characters