Merge "Adjust clamp to latest (Amsterdam)" into release-1.1.0