Merge "Use the same object when checking if the user is blocked instead of creating...