[KFSQA-747] from master