Merge proposals

bapteme packaging has no merge proposals.