[KFSQA-775] merge to master