Merge branch 'master' into application_stats_daily_table

r? @oyiptong