[KFSQA-838] Preliminary work, merged so others can use it while I finish up the last couple of steps.