am 46af48ac: Merge "Add clamp growth limit"

* commit '46af48acf4221a7f819d58dfffb576d0523ae285':
  Add clamp growth limit