Merge branch 'master' into develop
minor change before creating tests and JS framework
Merge branch 'develop'