Merge branch 'develop'
Merge branch 'develop'
simplify stats_client
Merge branch 'master' into develop