[KFSQA-747] merge from master