109853-while-waiting-for-patch-fixes