Merge "Guard against overflow errors for transparent regions"