am d4375b47: Merge "Fix loop limits." into klp-dev

* commit 'd4375b4713658c06001e9dba7105804c872fc199':
  Fix loop limits.