am 525680d2: Merge "Fix loop limits." into klp-modular-dev

* commit '525680d2bff686ecbddeb84f7f493f8bb31e670d':
  Fix loop limits.