Fix for counter layouts
Merge branch 'dev' into smbtc
Merge branch 'smbtc' of github.com:simbiotica/iom into smbtc