Merge "Fix Clamp runtime"