reformat
BUGFIX: typo item -> items
Merge pull request #1584 from graciani/fix_v6r8

Fix v6r8
v6r8p27
v6r9p14
Conflicts resolved after merging with rel-v6r8