Merge "(Vector) Fix random tc failure" into devel/master