Merge branch 'master' into develop
Helper class for tests
Merge branch 'develop'