Brushing off SVG
Merge pull request #8656 from DmitryBaranovskiy/master

Brushing off SVG