Merge "Fix for broken phone number snippet"