[PRQ#61276] Merge Request for hevi