[KFSQA-970] Final changes before merge.