Kracoeus 7296

This pull request contains the code for KRACOEUS-7296.
interesting that these workarounds are not needed.  Do the integration tests still work?