Merge "Removal of svg lib"