Merge proposals

Aristo-hadisoeganda has no merge proposals.