Reenabled logging and meters.
Merge branch 'test' into dev