Merge remote-tracking branch 'spalax/paternal/upload-svg'