Vector version
Merge branch 'vectors' into develop
Merge branch 'develop'