Fix for counter layouts
Merge branch 'dev' into production