Merge branch 'feature-test' into develop
Merge branch 'develop' of https://github.com/tomsocialcast/SCTest into develop