Merge "Fix collection iteration index." into lmp-dev