Added check for tester
Merge branch 'master' into production