Kracoeus-7002

Merged from mrudulpolus/KRACOEUS-7002.  Not fully functional.  Known issues are described in KRACOEUS-7745.  
Ok, I swear it was being called at a certain point, but now like you I can't find where that is.  Going to test it without it and remove it entirely if things work normally.