Merge pull request #1576 from graciani/fix_v6r7

Fix v6r7
v6r7p40