Merge "Remove duplicate clamping"