Merge branch 'svg-backend-work' into 'master'