[PRQ#41812] Merge Request for nats-server