Merge proposals

hydraulic-hybrid has no merge proposals.