Merge "(Vector) Fix crash issues" into devel/master