[PRQ#39630] Merge Request for evremap