[PRQ#48874] Merge Request for eidmiddleware