Merge "(Vector) Ensure not to add duplicated task" into devel/master