[PRQ#37882] Merge Request for v8-r