Patch#3598