Rin
Today
merge from vendingmachine_deploy_fix