Merge "Fix SVG crash issue" into devel/master