opt 2
Merge branch 'hotfix-stat-optim' into develop