[KFSQA-1054] merged from master