[642] Only update existing if in same group