[PRQ#73320] Merge Request for evdi-git