[KFSQA-765] merge from master