Merge branch 'develop'
Merge branch 'feature-histogram'
fix charts activity
Merge branch 'master' into develop