SVG shinkwrap

for 15.2 and cherry-picking to master