Today
merge from travelling_vendor_spawn_fix