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