Is this patch OK to merge as is, or do you want to try and verify/fix this second issue?