statistics (area stats) + fix
Merge remote-tracking branch 'origin/develop' into develop