Merge "Fix off-by-one issue when removing from Iterator" into klp-dev