[KFSQA-995] merged to master