Kracoeus-7002

Merged from mrudulpolus/KRACOEUS-7002.  Not fully functional.  Known issues are described in KRACOEUS-7745.  
Well I think we could either use a hidden field or maybe a data-attribute, but I'm ok with this for now.