[KFSQA-644] More progress.