[KFSQA-865] fixed issues after merging from master.