Merge "(Vector) Fix deadlock issue: remove lock" into devel/master