Merge "Update clamp config"