Initial pass at 3.8.11.1 hotfix.  Still have some work to do, confirming on several users sites first.  Props @1bigidea for part of initial patch.