[KFSQA-1036] merged from master