[PRQ#51663] Merge Request for edi