Yesterday
merge from puzzle_reset_changes/arctic_research -> puzzle_reset_changes