Merge "Create a flag for rescue party flag resets" into main