merge from APPLIANCE_HEAD