fix_stat_display_logic
Merge branch 'hotfix/fix_stat_display_logic'