Today
merge from vendingmachine_storage_monitor_fix