Patch #2, no longer applies to 10.1.x. I have re-rolled the patch. please review