Merge "Add clamp growth limit"