[PRQ#46556] Merge Request for yass-new