VSN modified.
Merge branch 'develop'

Merge 7