Merge "(Vector) Fix memory leak" into devel/master