Yesterday
merge from fix_nms_loot_reset -> main