[KFSQA-709] merged final version of KFSQA-681