am 1aac29c3: Merge "Fix off-by-one issue when removing from Iterator" into klp-dev

* commit '1aac29c3dd6feece257882469d9825255c69c736':
  Fix off-by-one issue when removing from Iterator