Merge "Create dir in /data for vendor customization"