Merge proposals

ent_h_end has no merge proposals.