Merge "Update access_vectors"