Merge "Adjust Clamp config"