[KFSQA-1007] merged from master