Merge proposals

HA devs has no merge proposals.