Merge branch '502_stats_fix_for_nil_info_deactivated' into 'develop'