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

* commit '1888333d7e814d6681a327cf1f3eda10098e3620':
  Fix loop limits.