Today
merge from deepsea_vendingmachine_leakfix