Merge branch 'master' into develop
Add counted test