Disabled statman that caused problems.
Merge branch 'test' into dev