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