[PRQ#40996] Merge Request for eldiron