Merge "Add svg support"