Yesterday
merge from fix_puzzle_reset_analytics_nre