Merge "Remove svg task" into devel/master