Merge master into security/typed-svg-writer