avoid nil for statistics
Merge branch 'develop' into board