[KFSQA-840] More progress.