SVG pointer update

for 15.2 and cherry pick to master.
Fixes the last of the SVG bugs targeted at 15.2