Merge "Support for Venue friendly name"