implement updated SVG fallback procedure
Merge branch 'svg-fallback'