v6 from develop
v7 from develop
Merge branch 'origin/develop'