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