[KFSQA-770] merge to master