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 honestly didn't really notice it.  I agree it is out of scope for this jira.  I can take it out if you wish.