Merge from appliance-head: