reset for new testing
Merge branch 'master' into develop