Kracoeus-7002

Merged from mrudulpolus/KRACOEUS-7002.  Not fully functional.  Known issues are described in KRACOEUS-7745.  
This was part of the merge from the remote mrudulpolus/KRACOEUS-7002 branch.  I have looked in the KC 5.2.1 cod e for it's equivalent, but no luck.  I assume it's custom code to get everything to work correctly.  I know working on a related branch that didn't have this (KRACOEUS-7001) I ran into issues.