Testv6 Issue #10
Merge branch 'hotfix/Issue#10v6'